test

flake.nix

@@ -39,6 +39,7 @@
     # Variables - Remember to set these
     hostname = "nixos-laptop"; # Should probably set this in a minimal configuration.nix?
     system = "x86_64-linux";
+    hmStateVersion = "23.05";
 
     pkgs = import unstable-nixpkgs {
       inherit system;
@@ -73,12 +74,12 @@
               useUserPackages = true;
               users.albert.imports = [ 
                 ({ config, ... }: import ./users/albert/home.nix  {
-                  inherit config pkgs hostname;
+                  inherit config pkgs hostname hmStateVersion;
                 })
               ];
               users.root.imports = [ 
                 ({ config, ... }: import ./users/root/home.nix  {
-                  inherit config pkgs hostname;
+                  inherit config pkgs hostname hmStateVersion;
                 })
               ];
             }; # home-manager

home-manager/default.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, hostname, ... }: {
+  imports = [ 
+    ./bash.nix
+    ./btop.nix
+    ./firefox.nix
+    ./git.nix
+    ./neovim.nix
+  ];
+}

hosts/nixos-laptop/default.nix

@@ -1,7 +1,7 @@
 { imports, ... }: {
   imports = [
     # imports.nixos-hardware.nixosModules.lenovo-thinkpad-p1
-    ./home-manager
     ./nixos
+    # home-manager is imported from users/user/home.nix
   ];
 }

users/albert/home.nix

@@ -1,14 +1,10 @@
-{ config, pkgs, hostname, ... }: {
-  home.stateVersion = "23.05";
+{ config, pkgs, hostname, hmStateVersion, ... }: {
+  home.stateVersion = ${hmStateVersion};
   imports = [ 
     # Host specific Configs:
-    ../../hosts/${hostname}/home-manager/default.nix
+    ../../hosts/${hostname}/home-manager
 
     # Universal Configs:
-    ../../home-manager/git.nix
-    ../../home-manager/neovim.nix
-    ../../home-manager/bash.nix
-    ../../home-manager/firefox.nix
-    ../../home-manager/btop.nix
+    ../../home-manager
   ];
 }

users/root/home.nix

@@ -1,9 +1,10 @@
-{ config, pkgs, hostname, ... }: {
-  home.stateVersion = "23.05";
+{ config, pkgs, hostname, hmStateVersion, ... }: {
+  home.stateVersion = ${hmStateVersion};
   imports = [ 
-    ../../home-manager/git.nix
-    ../../home-manager/neovim.nix
-    ../../home-manager/bash.nix
-    ../../home-manager/btop.nix
+    # Host specific Configs:
+    # ../../hosts/${hostname}/home-manager
+
+    # Universal Configs:
+    ../../home-manager
   ];
 }