diff --git a/flake.nix b/flake.nix
index 5fbaf1f..ebde352 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,13 +86,14 @@
             modules = [
               home-manager.nixosModules.home-manager
               (
-                { ... }:
+                { config, ... }:
                 {
                   # home-manager.useGlobalPkgs = true;
                   home-manager.useUserPackages = true;
                   home-manager.extraSpecialArgs = {
                     inherit inputs hostname username;
                     homeDirectory = "/home/${username}";
+                    stateVersion = config.system.stateVersion;
                   };
                   home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
                 }
diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix
index 7b9418e..7807c52 100644
--- a/home-manager/no-gui.nix
+++ b/home-manager/no-gui.nix
@@ -5,6 +5,7 @@
   homeDirectory,
   config,
   username,
+  stateVersion,
   ...
 }:
 let
@@ -111,7 +112,7 @@ in
     )
   ];
 
-  home.stateVersion = "25.11";
+  home.stateVersion = stateVersion;
 
   home.packages =
     with pkgs;
@@ -231,6 +232,4 @@ in
       signByDefault = true;
     };
   };
-
-  programs.home-manager.enable = true;
 }