diff --git a/home/home.nix b/home/home.nix
index e17aa1c..5b073b6 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,71 +1,66 @@
 { inputs, ... }@flakeContext:
 let
-  homeModule =
-    {
-      config,
-      lib,
-      pkgs,
-      xlib,
-      ...
-    }:
-    {
-
-      imports = [
-        (./. + "/${xlib.device.type}.nix")
-      ];
-      home = {
-        username = xlib.device.username;
-        stateVersion = lib.mkDefault "25.05";
-        homeDirectory = lib.mkDefault "/home/${config.home.username}";
-        enableNixpkgsReleaseCheck = false;
-      };
-    };
-  rootModule =
-    {
-      config,
-      lib,
-      pkgs,
-      xlib,
-      ...
-    }:
-    {
-      imports = [
-        (./. + "/${xlib.device.type}.nix")
-      ];
-      home = {
-        username = "root";
-        stateVersion = lib.mkDefault "25.05";
-        homeDirectory = lib.mkDefault "/${config.home.username}";
-        enableNixpkgsReleaseCheck = false;
-      };
-    };
   nixosModule =
     { xlib, ... }:
+    let
+
+      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 = lib.mkDefault "root";
+            stateVersion = lib.mkDefault "25.05";
+            homeDirectory = lib.mkDefault "/${config.home.username}";
+            enableNixpkgsReleaseCheck = false;
+          };
+        };
+
+    in
     {
       home-manager = {
         useGlobalPkgs = true;
         useUserPackages = true;
-        users."${xlib.device.username}" = homeModule;
-        users.root = rootModule;
+        users = {
+          "${xlib.device.username}" = homeModule;
+          root = rootModule;
+        };
         sharedModules = [
           inputs.plasma-manager.homeModules.plasma-manager
         ];
-        extraSpecialArgs = { 
+        extraSpecialArgs = {
           inherit inputs;
-          xlib = xlib;
+          inherit xlib;
         };
       };
     };
 in
-(
-  (inputs.home-manager.lib.homeManagerConfiguration {
-    modules = [
-      homeModule
-      rootModule
-    ];
-    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-  })
-  // {
-    inherit nixosModule;
-  }
-)
+{
+  inherit nixosModule;
+}
diff --git a/modules/default.nix b/modules/default.nix
index baae4ee..9fe38c0 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -22,7 +22,6 @@ let
         self.homeConfigurations.default.nixosModule # default homeConfigurations
         disko.nixosModules.disko # disko module
       ];
-
       _module.args = {
         inputs = inputs;
         xlib = config.xlib;
diff --git a/modules/essentials/settings.nix b/modules/essentials/settings.nix
index 91914cb..a7a7776 100644
--- a/modules/essentials/settings.nix
+++ b/modules/essentials/settings.nix
@@ -15,7 +15,7 @@
       substituters = [
         "https://nixos-cache-proxy.cofob.dev" # https://gist.github.com/cofob/9b1fd205e6d961a45c225ae9f0af1394
         "https://nixos-cache-proxy.elxreno.com"
-        "https://nix-community.cachix.org"  
+        "https://nix-community.cachix.org"
         # "https://cache.nixos.org"
         # "https://nixos-cache-proxy.sweetdogs.ru"
         #"https://nixos.snix.store" # https://nixos.snix.store/
diff --git a/modules/vds/xray.nix b/modules/vds/xray.nix
index fe3e1ef..f95682c 100644
--- a/modules/vds/xray.nix
+++ b/modules/vds/xray.nix
@@ -11,8 +11,14 @@
   };
 
   networking.firewall = {
-    allowedTCPPorts = [ 8443 9443 ];
-    allowedUDPPorts = [ 8443 9443 ];
+    allowedTCPPorts = [
+      8443
+      9443
+    ];
+    allowedUDPPorts = [
+      8443
+      9443
+    ];
   };
 
   environment.systemPackages = [ pkgs.xray ];