WiP

flake.nix

@@ -37,6 +37,7 @@
         nixpkgs.lib.nixosSystem {
           system = arch;
           modules = [
+            ./nixosModules
             ./hosts/${host}
             ./hosts/base
           ];

homeManagerModules/default.nix

@@ -0,0 +1 @@
+{ }: { }

hosts/base/default.nix

@@ -14,7 +14,6 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     inputs.nix-flatpak.nixosModules.nix-flatpak
-    ../../nixosModules
   ];
 
   # Bootloader.
@@ -138,6 +137,17 @@
 
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs;
+    };
+    sharedModules = [
+      ../../homeManagerModules
+    ];
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hosts/lenar/default.nix

@@ -63,13 +63,8 @@
   };
 
   home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit inputs;
-    };
     users = {
-      "krop" = import ../../users/krop;
+      "krop" = import ./home.nix;
     };
   };
 }

hosts/lenar/home.nix

@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  home.username = "krop";
+  home.homeDirectory = "/home/krop";
+  home.stateVersion = "24.05";
+}