From c09485e2be29bb55a861fe79685a2d28029ebe43 Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Tue, 30 Dec 2025 16:04:23 +0300
Subject: [PATCH] 123

---
 home/home.nix | 74 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 23 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 5b073b6..f548399 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,10 +1,15 @@
 { inputs, ... }@flakeContext:
 let
   nixosModule =
-    { xlib, ... }:
+    {
+      config,
+      lib,
+      xlib,
+      ...
+    }:
     let
-
-      homeModule =
+      mkHomeModule =
+        { username }:
         {
           config,
           lib,
@@ -16,31 +21,54 @@ let
             (./. + "/${xlib.device.type}.nix")
           ];
           home = {
-            username = xlib.device.username;
+            username = username;
             stateVersion = lib.mkDefault "25.05";
-            homeDirectory = "/home/${config.home.username}";
+            homeDirectory = if username == "root" then "/${username}" else "/home/${username}";
             enableNixpkgsReleaseCheck = false;
           };
         };
 
-      rootModule =
-        {
-          config,
-          lib,
-          pkgs,
-          ...
-        }:
-        {
-          imports = [
-            (./. + "/${xlib.device.type}.nix")
-          ];
-          home = {
-            username = lib.mkDefault "root";
-            stateVersion = lib.mkDefault "25.05";
-            homeDirectory = lib.mkDefault "/${config.home.username}";
-            enableNixpkgsReleaseCheck = false;
-          };
-        };
+      mkModule = username: mkHomeModule { username = username; };
+
+      homeModule = mkModule xlib.device.username;
+      rootModule = mkModule "root";
+      # homeModule =
+      #   {
+      #     config,
+      #     lib,
+      #     pkgs,
+      #     ...
+      #   }:
+      #   {
+      #     imports = [
+      #       (./. + "/${xlib.device.type}.nix")
+      #     ];
+      #     home = {
+      #       username = xlib.device.username;
+      #       stateVersion = lib.mkDefault "25.05";
+      #       homeDirectory = "/home/${config.home.username}";
+      #       enableNixpkgsReleaseCheck = false;
+      #     };
+      #   };
+
+      # rootModule =
+      #   {
+      #     config,
+      #     lib,
+      #     pkgs,
+      #     ...
+      #   }:
+      #   {
+      #     imports = [
+      #       (./. + "/${xlib.device.type}.nix")
+      #     ];
+      #     home = {
+      #       username = "root";
+      #       stateVersion = lib.mkDefault "25.05";
+      #       homeDirectory = lib.mkDefault "/${config.home.username}";
+      #       enableNixpkgsReleaseCheck = false;
+      #     };
+      #   };
 
     in
     {