From 91a36ec0c6aa298523254d8401a46c3a96d16f6d Mon Sep 17 00:00:00 2001
From: aloslider <53711835+aloslider@users.noreply.github.com>
Date: Fri, 17 Apr 2026 16:00:29 +0300
Subject: [PATCH] Restructure home module

---
 home/benq/core/default.nix                  |  7 +++++++
 home/{common/optional => benq/core}/git.nix |  0
 home/benq/core/zsh.nix                      |  7 +++++++
 home/benq/homelab.nix                       | 16 ++++++++++++----
 home/benq/packages.nix                      | 12 ------------
 hosts/homelab/configuration.nix             |  4 ++--
 6 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 home/benq/core/default.nix
 rename home/{common/optional => benq/core}/git.nix (100%)
 create mode 100644 home/benq/core/zsh.nix
 delete mode 100644 home/benq/packages.nix

diff --git a/home/benq/core/default.nix b/home/benq/core/default.nix
new file mode 100644
index 0000000..3549d8c
--- /dev/null
+++ b/home/benq/core/default.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  imports = [
+    ./git.nix
+    ./zsh.nix
+  ];
+}
diff --git a/home/common/optional/git.nix b/home/benq/core/git.nix
similarity index 100%
rename from home/common/optional/git.nix
rename to home/benq/core/git.nix
diff --git a/home/benq/core/zsh.nix b/home/benq/core/zsh.nix
new file mode 100644
index 0000000..e3e52db
--- /dev/null
+++ b/home/benq/core/zsh.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    envExtra = "";
+  };
+}
diff --git a/home/benq/homelab.nix b/home/benq/homelab.nix
index 6143bbc..ec61cfd 100644
--- a/home/benq/homelab.nix
+++ b/home/benq/homelab.nix
@@ -17,12 +17,20 @@
       { pkgs, ... }:
       {
         imports = lib.flatten [
-          ./packages.nix
-          (map (f: lib.custom.relativeToRoot "home/common/optional/${f}") [
-            "git.nix"
-          ])
+          (map lib.custom.relativeToRoot (
+            [
+              "home/benq/core"
+            ]
+            ++ (map (f: "home/benq/optional/${f}") [
+            ])
+          ))
         ];
 
+        home.packages = with pkgs; [
+          chezmoi
+          lazygit
+          lazydocker
+        ];
         home.stateVersion = "25.05";
       };
   };
diff --git a/home/benq/packages.nix b/home/benq/packages.nix
deleted file mode 100644
index 0577416..0000000
--- a/home/benq/packages.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  home.packages = with pkgs; [
-    chezmoi
-    lazygit
-    lazydocker
-  ];
-}
diff --git a/hosts/homelab/configuration.nix b/hosts/homelab/configuration.nix
index cfd49b1..d4299f7 100644
--- a/hosts/homelab/configuration.nix
+++ b/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";
 }