Restructure home module

home/benq/core/default.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  imports = [
+    ./git.nix
+    ./zsh.nix
+  ];
+}

home/benq/core/zsh.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    envExtra = "";
+  };
+}

home/benq/homelab.nix

@@ -17,12 +17,20 @@
       { pkgs, ... }:
       {
         imports = lib.flatten [
-          ./packages.nix
+          (map lib.custom.relativeToRoot (
-          (map (f: lib.custom.relativeToRoot "home/common/optional/${f}") [
+            [
-            "git.nix"
+              "home/benq/core"
-          ])
+            ]
+            ++ (map (f: "home/benq/optional/${f}") [
+            ])
+          ))
         ];
 
+        home.packages = with pkgs; [
+          chezmoi
+          lazygit
+          lazydocker
+        ];
         home.stateVersion = "25.05";
       };
   };

home/benq/packages.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  home.packages = with pkgs; [
-    chezmoi
-    lazygit
-    lazydocker
-  ];
-}

hosts/homelab/configuration.nix

@@ -11,7 +11,7 @@
     (map lib.custom.relativeToRoot (
       [
         "hosts/common/core"
-				"hosts/common/users/benq.nix"
+        "hosts/common/users/benq.nix"
         "home/benq/homelab.nix"
       ]
       ++ (map (f: "hosts/common/optional/${f}") [
@@ -25,5 +25,5 @@
   ];
 
   disko.cfg.mainDevice = "/dev/disk/by-id/ata-AMD_R5M120G8_07092225C0040";
-	system.stateVersion = "26.05";
+  system.stateVersion = "26.05";
 }