unfucking users again :3

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 {
+      homeConfigurations = {
+        ruby = home-manager.lib.homeManagerConfiguration {
           extraSpecialArgs = specialArgs;
-        pkgs = nixpkgs.legacyPackages.${system};
+          pkgs = pkgs;
           modules = [
-    #     ./home-manager/${user}/home.nix
             ./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
-          #       ];
-          #     };
-          #   };
-          # }
         ];
       };
     };

home-manager/autumn/home.nix

@@ -1,22 +1,11 @@
 { config, pkgs, ... }:
 
 {
-  # Home Manager needs a bit of information about you and the paths it should
+  home = {
-  # manage.
+    username = "autumn";
-  home.username = "autumn";
+    homeDirectory = "/home/autumn";
-  home.homeDirectory = "/home/autumn";
+    stateVersion = "25.11";
-  home.stateVersion = "25.05"; # Please read the comment before changing.
+    packages = with pkgs; [
-
-
-  programs.home-manager.enable = true;
-  
-
-  nixpkgs.config = {
-    alowUnfree = true;
-    allowUnfreePredicate = (_: true);
-  };
-  
-  home.packages = with pkgs; [
       neofetch
       vscodium-fhs
       nerd-fonts.hack
@@ -36,25 +25,40 @@
       ruff
       ruby
       vscode-extensions.castwide.solargraph
+      rubyPackages_3_4.solargraph
       nim-2_0
       nimlangserver
+      fm
+      kdlfmt
     ];
-
+    sessionVariables = {
-  programs.htop.enable = true;
-  programs.starship.enable = true;
-
-  home.sessionVariables = {
       EDITOR = "helix";
       TERM = "alacritty";
     };
+    file = {
       
+    };
+  };
+  programs = {
+    home-manager.enable = true;
+    htop.enable = true;
+  };
+  nixpkgs.config = {
+    alowUnfree = true;
+    allowUnfreePredicate = (_: true);
+  };
+  # 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
   ]; 
-  
 }

home-manager/autumn/sysconfs/yukigekko.nix

@@ -0,0 +1,7 @@
+{config, pkgs, ...}:
+{
+  imports = [
+    ../../packages/river/river.nix
+    ../../packages/waybar/waybar.nix
+  ];
+}

home-manager/autumn/yukigekko-home.nix

@@ -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
-  ];
-  
-}

home-manager/packages/alacritty/alacritty.nix

@@ -2,10 +2,6 @@
 
 {
 
-home.packages = with pkgs; [
-  alacritty
-];
-
   programs.alacritty = {
     enable = true;
     settings = {

home-manager/packages/direnv/direnv.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+
+home.packages = with pkgs; [
+];
+
+  programs. = {
+    enable = true;
+  
+  };
+  
+}
+

home-manager/packages/fish/fish.nix

@@ -3,7 +3,6 @@
 {
 
 	home.packages = with pkgs; [
-	  fish
 	  oh-my-fish
 	];
 

home-manager/packages/fuzzel/fuzzel.nix

@@ -2,9 +2,6 @@
 
 {
 
-#home.packages = with pkgs; [
-#  fuzzel
-#];
 
   programs.fuzzel = {
     enable = true;

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";
   };
-  
 }
-

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";};
   };
-  
 }
-

home-manager/packages/river/river.nix

@@ -4,7 +4,6 @@
 
   home.packages = with pkgs; [
     wideriver
-    river
   ];
 
   

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;
   };
-
-  
-  
 }
-

home-manager/packages/uv/uv.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  programs.uv = {
+    enable = true;
+    
+  };
+}

home-manager/packages/waybar/waybar.nix

@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-
-  home.packages = with pkgs; [
-    waybar
-  ];
-
   programs.waybar = {
     enable = true;
     systemd.enable = true;

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;
     };
   };
-  
 }
-

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
   ]; 
 }

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";