Reorganize user configuration

flake/hosts.nix

@@ -16,9 +16,9 @@ in
         inherit inputs self;
       };
       modules = [
+        { networking.hostName = name; }
         "${self}/hosts/${name}"
         "${self}/users/seb/@${name}"
-        { networking.hostName = name; }
       ];
     }
   );

users/common.nix

@@ -1,20 +1,10 @@
-{ inputs, self, ... }:
+{ self, ... }:
 {
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit inputs self;
-    };
-  };
-
-  home-manager.sharedModules = [
+  imports = [
     self.homeManagerModules.default
     self.wrappers.default
+  ];
 
-    {
   programs.home-manager.enable = true;
   systemd.user.startServices = "sd-switch";
 
@@ -26,6 +16,4 @@
       extraConfig.XDG_SCREENSHOTS_DIR = "$HOME/Pictures/Screenshots";
     };
   };
-    }
-  ];
 }

users/home-manager.nix

@@ -0,0 +1,12 @@
+{ inputs, self, ... }:
+{
+  imports = [ inputs.home-manager.nixosModules.home-manager ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs self;
+    };
+  };
+}

users/seb/@inspiron/default.nix

@@ -1,9 +1,14 @@
+{ self, ... }:
 {
-  imports = [ ../default.nix ];
+  imports = [
+    "${self}/users/home-manager.nix"
+    ../user.nix
+  ];
 
   home-manager.users.seb = {
-    home.stateVersion = "23.11";
+    imports = [ ../home.nix ];
 
+    home.stateVersion = "23.11";
     myConfig.theme = "light";
 
     wayland.windowManager.hyprland.settings.monitor = [

users/seb/@north/default.nix

@@ -1,10 +1,16 @@
-{ pkgs, ... }:
+{ self, ... }:
 {
-  imports = [ ../default.nix ];
+  imports = [
+    "${self}/users/home-manager.nix"
+    ../user.nix
+  ];
+
+  home-manager.users.seb =
+    { pkgs, ... }:
+    {
+      imports = [ ../home.nix ];
 
-  home-manager.users.seb = {
       home.stateVersion = "23.11";
-
       myConfig.theme = "dark";
 
       home.packages = [

users/seb/home.nix

@@ -5,6 +5,8 @@
   ...
 }:
 {
+  imports = [ ../common.nix ];
+
   myConfig = {
     sops.enable = true;
     shell.zsh.enable = true;

users/seb/user.nix

@@ -1,7 +1,5 @@
 { config, ... }:
 {
-  imports = [ ../common.nix ];
-
   sops.secrets.seb-password.neededForUsers = true;
 
   users.users.seb = {
@@ -15,6 +13,4 @@
       "video"
     ];
   };
-
-  home-manager.users.seb = ./home.nix;
 }