From 44f5469b495539341411a602a7917bf577b337d4 Mon Sep 17 00:00:00 2001 From: autumn Date: Wed, 27 Aug 2025 10:47:56 -0600 Subject: [PATCH] unfucking users again :3 --- flake.nix | 40 ++++---- home-manager/autumn/home.nix | 94 ++++++++++--------- home-manager/autumn/sysconfs/yukigekko.nix | 7 ++ home-manager/autumn/yukigekko-home.nix | 67 ------------- home-manager/packages/alacritty/alacritty.nix | 4 - home-manager/packages/direnv/direnv.nix | 14 +++ home-manager/packages/fish/fish.nix | 1 - home-manager/packages/fuzzel/fuzzel.nix | 3 - home-manager/packages/git/git.nix | 9 +- home-manager/packages/helix/helix.nix | 7 -- home-manager/packages/river/river.nix | 1 - home-manager/packages/starship/starship.nix | 10 -- home-manager/packages/uv/uv.nix | 8 ++ home-manager/packages/waybar/waybar.nix | 5 - home-manager/packages/zellij/zellij.nix | 27 ++++-- home-manager/ruby/home.nix | 6 +- system/yukigekko/configuration.nix | 6 ++ 17 files changed, 126 insertions(+), 183 deletions(-) create mode 100644 home-manager/autumn/sysconfs/yukigekko.nix delete mode 100644 home-manager/autumn/yukigekko-home.nix create mode 100644 home-manager/packages/direnv/direnv.nix create mode 100644 home-manager/packages/uv/uv.nix diff --git a/flake.nix b/flake.nix index 5d18e60..290390e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ description = "Autumn's multi-system configs"; inputs = { + # pydev.url ="./subflakes/pydev.nix"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -12,6 +13,7 @@ let system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; timezone = "America/Denver"; locale = "en_US.UTF-8"; specialArgs = { @@ -22,34 +24,30 @@ }; in { - homeConfigurations.ruby= home-manager.lib.homeManagerConfiguration { - extraSpecialArgs = specialArgs; - pkgs = nixpkgs.legacyPackages.${system}; - modules = [ - # ./home-manager/${user}/home.nix - ./home-manager/ruby/home.nix - ]; + homeConfigurations = { + ruby = home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgs; + pkgs = pkgs; + modules = [ + ./home-manager/ruby/home.nix + ]; + }; + "autumn@yukigekko" = home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgs; + pkgs = pkgs; + modules = [ + ./home-manager/autumn/home.nix + ./home-manager/autumn/sysconfs/yukigekko.nix + ]; + }; }; + nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; modules = [ ./system/yukigekko/configuration.nix - # home-manager.nixosModules.home-manager{ - # home-manager = { - # useGlobalPkgs = true; - # useUserPackages = true; - # extraSpecialArgs = specialArgs; - # users.${user} = { - # # pkgs = nixpkgs.legacyPackages.${system}; - # imports = [ - # #./home-manager/${user}/home.nix - # ./home-manager/autumn/yukigekko-home.nix - # ]; - # }; - # }; - # } ]; }; }; diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix index e180cda..8283538 100644 --- a/home-manager/autumn/home.nix +++ b/home-manager/autumn/home.nix @@ -1,60 +1,64 @@ { config, pkgs, ... }: { - # Home Manager needs a bit of information about you and the paths it should - # manage. - home.username = "autumn"; - home.homeDirectory = "/home/autumn"; - home.stateVersion = "25.05"; # Please read the comment before changing. - - - programs.home-manager.enable = true; - - + home = { + username = "autumn"; + homeDirectory = "/home/autumn"; + stateVersion = "25.11"; + packages = with pkgs; [ + neofetch + vscodium-fhs + nerd-fonts.hack + vesktop + obsidian + ccls + docker-language-server + nil + ty + rustc + rustup + htop + gnumake + python314Full + eza + gleam + ruff + ruby + vscode-extensions.castwide.solargraph + rubyPackages_3_4.solargraph + nim-2_0 + nimlangserver + fm + kdlfmt + ]; + sessionVariables = { + EDITOR = "helix"; + TERM = "alacritty"; + }; + file = { + + }; + }; + programs = { + home-manager.enable = true; + htop.enable = true; + }; nixpkgs.config = { alowUnfree = true; allowUnfreePredicate = (_: true); }; - - home.packages = with pkgs; [ - neofetch - vscodium-fhs - nerd-fonts.hack - vesktop - obsidian - ccls - docker-language-server - nil - ty - rustc - rustup - htop - gnumake - python314Full - eza - gleam - ruff - ruby - vscode-extensions.castwide.solargraph - nim-2_0 - nimlangserver - ]; - - programs.htop.enable = true; - programs.starship.enable = true; - - home.sessionVariables = { - EDITOR = "helix"; - TERM = "alacritty"; - }; - + # wayland.windowManager.river.enable = true; imports = [ ../packages/fish/fish.nix + ../packages/river/river.nix ../packages/alacritty/alacritty.nix ../packages/helix/helix.nix ../packages/fuzzel/fuzzel.nix + ../packages/waybar/waybar.nix ../packages/git/git.nix ../packages/starship/starship.nix - ]; - + ../pakcages/direnv/direnv.nix + ../packages/zellij/zellij.nix + ../packages/poetry/poetry.nix + ]; } diff --git a/home-manager/autumn/sysconfs/yukigekko.nix b/home-manager/autumn/sysconfs/yukigekko.nix new file mode 100644 index 0000000..ffb1b61 --- /dev/null +++ b/home-manager/autumn/sysconfs/yukigekko.nix @@ -0,0 +1,7 @@ +{config, pkgs, ...}: +{ + imports = [ + ../../packages/river/river.nix + ../../packages/waybar/waybar.nix + ]; +} diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix deleted file mode 100644 index b4292e2..0000000 --- a/home-manager/autumn/yukigekko-home.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Home Manager needs a bit of information about you and the paths it should - # manage. - home.username = "autumn"; - home.homeDirectory = "/home/autumn"; - home.stateVersion = "25.05"; # Please read the comment before changing. - - - programs.home-manager.enable = true; - - - nixpkgs.config = { - alowUnfree = true; - allowUnfreePredicate = (_: true); - }; - - home.packages = with pkgs; [ - neofetch - vscodium-fhs - nerd-fonts.hack - vesktop - obsidian - ccls - docker-language-server - nil - ty - rustc - rustup - htop - gnumake - python314Full - eza - gleam - ruff - ruby - vscode-extensions.castwide.solargraph - nim-2_0 - nimlangserver - ]; - programs.htop.enable = true; - programs.starship.enable = true; - programs.bash.initExtra = " - fish - "; - - wayland.windowManager.river.enable = true; - - - home.sessionVariables = { - EDITOR = "helix"; - TERM = "alacritty"; - }; - - imports = [ - ../packages/fish/fish.nix - ../packages/river/river.nix - ../packages/alacritty/alacritty.nix - ../packages/helix/helix.nix - ../packages/fuzzel/fuzzel.nix - ../packages/waybar/waybar.nix - ../packages/git/git.nix - ../packages/starship/starship.nix - ]; - -} diff --git a/home-manager/packages/alacritty/alacritty.nix b/home-manager/packages/alacritty/alacritty.nix index 5278cc1..eed4f89 100644 --- a/home-manager/packages/alacritty/alacritty.nix +++ b/home-manager/packages/alacritty/alacritty.nix @@ -2,10 +2,6 @@ { -home.packages = with pkgs; [ - alacritty -]; - programs.alacritty = { enable = true; settings = { diff --git a/home-manager/packages/direnv/direnv.nix b/home-manager/packages/direnv/direnv.nix new file mode 100644 index 0000000..2a0cfd4 --- /dev/null +++ b/home-manager/packages/direnv/direnv.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + +home.packages = with pkgs; [ +]; + + programs. = { + enable = true; + + }; + +} + diff --git a/home-manager/packages/fish/fish.nix b/home-manager/packages/fish/fish.nix index 45d2923..b920f2d 100644 --- a/home-manager/packages/fish/fish.nix +++ b/home-manager/packages/fish/fish.nix @@ -3,7 +3,6 @@ { home.packages = with pkgs; [ - fish oh-my-fish ]; diff --git a/home-manager/packages/fuzzel/fuzzel.nix b/home-manager/packages/fuzzel/fuzzel.nix index 30a821f..5479e71 100644 --- a/home-manager/packages/fuzzel/fuzzel.nix +++ b/home-manager/packages/fuzzel/fuzzel.nix @@ -2,9 +2,6 @@ { -#home.packages = with pkgs; [ -# fuzzel -#]; programs.fuzzel = { enable = true; diff --git a/home-manager/packages/git/git.nix b/home-manager/packages/git/git.nix index 8d243ee..e69fc77 100644 --- a/home-manager/packages/git/git.nix +++ b/home-manager/packages/git/git.nix @@ -1,16 +1,9 @@ { config, pkgs, ... }: { - -home.packages = with pkgs; [ - git -]; - programs.git = { enable = true; - userEmail = "autumnal,musing@gmail.com"; + userEmail = "autumnal.musing@gmail.com"; userName = "autumn"; }; - } - diff --git a/home-manager/packages/helix/helix.nix b/home-manager/packages/helix/helix.nix index 5f10d84..69528d2 100644 --- a/home-manager/packages/helix/helix.nix +++ b/home-manager/packages/helix/helix.nix @@ -1,15 +1,8 @@ { config, pkgs, ... }: { - -home.packages = with pkgs; [ - helix -]; - programs.helix = { enable = true; settings = {theme = "everforest_dark";}; }; - } - diff --git a/home-manager/packages/river/river.nix b/home-manager/packages/river/river.nix index aa1d749..b1d5b5b 100644 --- a/home-manager/packages/river/river.nix +++ b/home-manager/packages/river/river.nix @@ -4,7 +4,6 @@ home.packages = with pkgs; [ wideriver - river ]; diff --git a/home-manager/packages/starship/starship.nix b/home-manager/packages/starship/starship.nix index 120904a..f7fe9c3 100644 --- a/home-manager/packages/starship/starship.nix +++ b/home-manager/packages/starship/starship.nix @@ -1,19 +1,9 @@ { config, pkgs, ... }: { - - home.packages = with pkgs;[ - starship - ]; - xdg.configFile."starship.toml".source = ./starship.toml; - programs.starship = { enable = true; enableFishIntegration = true; }; - - - } - diff --git a/home-manager/packages/uv/uv.nix b/home-manager/packages/uv/uv.nix new file mode 100644 index 0000000..8eb8e7f --- /dev/null +++ b/home-manager/packages/uv/uv.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ + programs.uv = { + enable = true; + + }; +} diff --git a/home-manager/packages/waybar/waybar.nix b/home-manager/packages/waybar/waybar.nix index 0ebdcf2..0bfe3a0 100644 --- a/home-manager/packages/waybar/waybar.nix +++ b/home-manager/packages/waybar/waybar.nix @@ -1,11 +1,6 @@ { config, pkgs, ... }: { - - home.packages = with pkgs; [ - waybar - ]; - programs.waybar = { enable = true; systemd.enable = true; diff --git a/home-manager/packages/zellij/zellij.nix b/home-manager/packages/zellij/zellij.nix index eeaf0d2..a2af1e9 100644 --- a/home-manager/packages/zellij/zellij.nix +++ b/home-manager/packages/zellij/zellij.nix @@ -1,19 +1,28 @@ { config, pkgs, ... }: { - - home.packages = with pkgs; [ - zellij - ]; - programs.zellij = { enable = true; - enableFishIntegration = true; + # enableFishIntegration = true; exitShellOnExit = true; settings = { - theme = "everforest-dark"; + themes = { + custom = { + bg = "#2b3339"; + fg = "#d3c6aa"; + black = "#2b3339"; + red = "#e67e80"; + green = "#a7c080"; + yellow = "#dbbc7f"; + blue = "#7fbbb3"; + magenta = "#d699b6"; + cyan = "#83c092"; + white = "#d3c6aa"; + orange = "#FF9E64"; + }; + }; + theme = "custom"; + advanced_mouse_actions = false; }; }; - } - diff --git a/home-manager/ruby/home.nix b/home-manager/ruby/home.nix index 5288b0a..6fe105a 100644 --- a/home-manager/ruby/home.nix +++ b/home-manager/ruby/home.nix @@ -29,7 +29,6 @@ nim-2_0 nimlangserver fm - zellij kdlfmt ]; sessionVariables = { @@ -48,7 +47,7 @@ alowUnfree = true; allowUnfreePredicate = (_: true); }; - wayland.windowManager.river.enable = true; + # wayland.windowManager.river.enable = true; imports = [ ../packages/fish/fish.nix ../packages/river/river.nix @@ -58,5 +57,8 @@ ../packages/waybar/waybar.nix ../packages/git/git.nix ../packages/starship/starship.nix + ../pakcages/direnv/direnv.nix + ../packages/zellij/zellij.nix + ../packages/poetry/poetry.nix ]; } diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index 9e1e755..ebeadd9 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -75,6 +75,12 @@ extraGroups = [ "networkmanager" "wheel" ]; }; + users.users.autumn= { + isNormalUser = true; + description = "Autumn"; + extraGroups = [ "networkmanager" "wheel" ]; + }; + # Install firefox. programs.firefox.enable = true; programs.bash.interactiveShellInit = "fish";