diff --git a/flake.nix b/flake.nix
index d645c21..bcc9513 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,28 +11,39 @@
   outputs = { self, nixpkgs, home-manager }@inputs: 
 
     let
-      username = "autumn";
+      user = "autumn";
       system = "x86_64-linux";
       timezone = "America/Denver";
       locale = "en_US.UTF-8";
-
+      specialArgs = {
+        inherit inputs;
+        inherit user;
+        inherit system;
+        inherit timezone;
+        inherit locale;
+      };
     in {
-
-      homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
+    
+      homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.${system};
-        extraSpecialArgs = {inherit inputs;};
       };
       
       nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{
-        specialArgs = {
-          inherit inputs;
-          inherit system;
-          inherit username;
-          inherit timezone;
-          inherit locale;
-        };
+        specialArgs = specialArgs;
         modules = [
-          ./system/nixos/configuration.nix ./home-manager/autumn/yukigekko-home.nix
+          ./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
+                ];
+              };
+            };
+          }
         ];
       };
     };
diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix
index 54d9472..ea5eb5a 100644
--- a/home-manager/autumn/yukigekko-home.nix
+++ b/home-manager/autumn/yukigekko-home.nix
@@ -1,14 +1,15 @@
-{ config, lib, pkgs, ... }:
+{  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.stateVersion = "25.05"; # Please read the comment before changing.
 
   nixpkgs.config = {
     alowUnfree = true;