Merge pull request #28 from mightyiam/stateVersion

stateVersion
mightyiam · Jun 28, 2024 · 71e6180 · 71e6180
2 parents 1186cfa + 5491e89
commit 71e6180
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git a/examples/home/flake.nix b/examples/home/flake.nix
@@ -6,6 +6,7 @@
       modules = [
         nixconfigs.homeManagerModules.mightyiam
         {
+          home.stateVersion = "24.11";
           location.latitude = 18.746;
           location.longitude = 99.075;
         }

diff --git a/flake.nix b/flake.nix
@@ -25,7 +25,10 @@
             ./nixos-modules/hosts/mightyiam-desktop
             inputs.home-manager.nixosModules.home-manager
             {
-              home-manager.users.mightyiam.imports = [self.homeManagerModules.mightyiam];
+              home-manager.users.mightyiam.imports = [
+                self.homeManagerModules.mightyiam
+                ({osConfig, ...}: {home.stateVersion = osConfig.system.stateVersion;})
+              ];
             }
           ];
         };
@@ -35,7 +38,10 @@
             ./nixos-modules/hosts/ganoderma
             inputs.home-manager.nixosModules.home-manager
             {
-              home-manager.users.mightyiam.imports = [self.homeManagerModules.mightyiam];
+              home-manager.users.mightyiam.imports = [
+                self.homeManagerModules.mightyiam
+                ({osConfig, ...}: {home.stateVersion = osConfig.system.stateVersion;})
+              ];
             }
           ];
         };

diff --git a/home/home.nix b/home/home.nix
@@ -32,7 +32,6 @@
 
     config.programs.home-manager.enable = true;
 
-    config.home.stateVersion = "21.05";
     config.home.sessionVariables.TZ = "\$(<~/.config/timezone)";
   };
 in {

diff --git a/nixos-modules/hosts/ganoderma/default.nix b/nixos-modules/hosts/ganoderma/default.nix
@@ -3,6 +3,7 @@
     ../../types/desktop.nix
     ./mobo.nix
     ./filesystems.nix
+    ./state-version.nix
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";

diff --git a/nixos-modules/hosts/ganoderma/state-version.nix b/nixos-modules/hosts/ganoderma/state-version.nix
@@ -0,0 +1,3 @@
+{
+  system.stateVersion = "24.11";
+}
diff --git a/nixos-modules/hosts/mightyiam-desktop/default.nix b/nixos-modules/hosts/mightyiam-desktop/default.nix
@@ -5,6 +5,7 @@
     ./gpu.nix
     ./filesystems.nix
     ./cpu.nix
+    ./state-version.nix
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";

diff --git a/nixos-modules/hosts/mightyiam-desktop/state-version.nix b/nixos-modules/hosts/mightyiam-desktop/state-version.nix
@@ -0,0 +1,3 @@
+{
+  system.stateVersion = "24.11";
+}
diff --git a/nixos-modules/modules/state-version.nix b/nixos-modules/modules/state-version.nix
diff --git a/nixos-modules/types/desktop.nix b/nixos-modules/types/desktop.nix
@@ -17,7 +17,6 @@
     "printing.nix"
     "service-discovery.nix"
     "shell.nix"
-    "state-version.nix"
     "steam.nix"
     "sudo.nix"
     "tmp.nix"
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ @@
         config.programs.home-manager.enable = true;
-        config.home.stateVersion = "21.05";
         config.home.sessionVariables.TZ = "\$(<~/.config/timezone)";
       };
     in {
@@ Expand Down @@