undoing stupid changes

flake.nix

@@ -1,6 +1,6 @@
 {
   
-  description = "Autumn's laptop config";
+  description = "Autumn's multi-system configs";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
@@ -24,26 +24,33 @@
       };
     in {
     
-      homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
-      };
+    homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration {
+      extraSpecialArgs = specialArgs;
+      pkgs = nixpkgs.legacyPackages.${system};
+       modules = [
+    #     ./home-manager/${user}/home.nix
+        ./home-manager/${user}/yukigekko-home.nix
+       ];
+    };
       
       nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{
         specialArgs = specialArgs;
         modules = [
-          ./system/nixos/configuration.nix home-manager.nixosModules.home-manager{
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              extraSpecialArgs = specialArgs;
-              users.${user} = {
-                home.stateVersion = "25.11";
-                imports = [
-                  ./home-manager/${user}/yukigekko-home.nix
-                ];
-              };
-            };
-          }
+          ./system/nixos/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

@@ -0,0 +1,68 @@
+{ 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/autumn/yukigekko-home.nix

@@ -1,58 +1,57 @@
-{  pkgs, ... }:
+{ 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.
+   home.username = "autumn";
+   home.homeDirectory = "/home/autumn";
+   home.stateVersion = "25.05"; # Please read the comment before changing.
 
 
-  programs.home-manager.enable = true;
+   programs.home-manager.enable = true;
   
 
-  nixpkgs.config = {
-    alowUnfree = true;
-    allowUnfreePredicate = (_: 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
-  ";
+   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";
-  };
+   home.sessionVariables = {
+     EDITOR = "helix";
+     TERM = "alacritty";
+   };
 
   imports = [
     ../packages/fish/fish.nix

home-manager/packages/fish/fish.nix

@@ -4,10 +4,14 @@
 
 	home.packages = with pkgs; [
 	  fish
+	  oh-my-fish
 	];
 
   programs.fish = {
     enable = true;
+    interactiveShellInit = ''
+      set fish_greeting ""
+    '';
     shellAliases = {
       ".." = "cd ..";
       "..." = "cd ../..";