Reorganize user configuration

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,26 +1,32 @@
-{ pkgs, ... }:
+{ self, ... }:
 {
-  imports = [ ../default.nix ];
+  imports = [
+    "${self}/users/home-manager.nix"
+    ../user.nix
+  ];
 
-  home-manager.users.seb = {
-    home.stateVersion = "23.11";
+  home-manager.users.seb =
+    { pkgs, ... }:
+    {
+      imports = [ ../home.nix ];
 
-    myConfig.theme = "dark";
+      home.stateVersion = "23.11";
+      myConfig.theme = "dark";
 
-    home.packages = [
-      pkgs.ffmpeg
-      pkgs.obs-studio
-      pkgs.davinci-resolve
-      pkgs.gimp
-    ];
-
-    wayland.windowManager.hyprland.settings = {
-      monitor = [
-        "Unknown-1,disable"
-        "DP-1,2560x1440@144,0x0,1"
-        "HDMI-A-1,2560x1440@60,-1440x-617,1,transform,1"
+      home.packages = [
+        pkgs.ffmpeg
+        pkgs.obs-studio
+        pkgs.davinci-resolve
+        pkgs.gimp
       ];
-      workspace = [ "m[HDMI-A-1],layoutopt:orientation:top" ];
+
+      wayland.windowManager.hyprland.settings = {
+        monitor = [
+          "Unknown-1,disable"
+          "DP-1,2560x1440@144,0x0,1"
+          "HDMI-A-1,2560x1440@60,-1440x-617,1,transform,1"
+        ];
+        workspace = [ "m[HDMI-A-1],layoutopt:orientation:top" ];
+      };
     };
-  };
 }

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;
 }