From 9fe1be95644c20124547b0a7ecb01568d3825ac2 Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Mon, 4 Aug 2025 19:06:26 +0300
Subject: [PATCH] 123

---
 devices/wsl.nix                 | 15 +++++++++------
 home/default.nix                | 18 +++++++-----------
 home/modules/wsl.nix            |  4 +++-
 modules/default.nix             | 24 ------------------------
 modules/essentials/services.nix |  2 +-
 5 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/devices/wsl.nix b/devices/wsl.nix
index f344647..27e3900 100755
--- a/devices/wsl.nix
+++ b/devices/wsl.nix
@@ -9,22 +9,25 @@ let
       ...
     }:
     {
-      device.type = "wsl";
+      xlib.device.type = "wsl";
 
       imports = with inputs; [
+        # Hardware
         nixos-wsl.nixosModules.default
+
+        # Base
+        self.homeConfigurations.default.nixosModule
         self.nixosModules.default
 
+        # Custom
         self.nixosModules.software.beets
         self.nixosModules.server.open-webui
-
-        self.homeConfigurations.default.nixosModule
       ];
 
       home-manager = {
         extraSpecialArgs = {
-          inherit inputs;
-          deviceType = config.device.type; # Переименовываем type в deviceType
+          #inherit inputs;
+          xlib = config.xlib;
         };
       };
 
@@ -63,7 +66,7 @@ let
         enable = true;
         startMenuLaunchers = true;
         #useWindowsDriver = true;
-        defaultUser = "${inputs.zeroq.devices.admin}";
+        defaultUser = config.xlib.device.username;
       };
 
       system.stateVersion = "24.11";
diff --git a/home/default.nix b/home/default.nix
index c709a3c..ee55f06 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,15 +5,15 @@ let
       config,
       lib,
       pkgs,
-      deviceType,
+      xlib,
       ...
     }:
     {
       imports = [
-        inputs.self.homeModules.${deviceType}
+        inputs.self.homeModules."${xlib.device.type}"
       ];
       home = {
-        username = "${inputs.zeroq.devices.admin}";
+        username = xlib.device.username;
         stateVersion = lib.mkDefault "25.05";
         homeDirectory = lib.mkDefault "/home/${config.home.username}";
         enableNixpkgsReleaseCheck = false;
@@ -24,12 +24,12 @@ let
       config,
       lib,
       pkgs,
-      deviceType,
+      xlib,
       ...
     }:
     {
       imports = [
-        inputs.self.homeModules.${deviceType}
+        inputs.self.homeModules."${xlib.device.type}"
       ];
       home = {
         username = "root";
@@ -39,18 +39,14 @@ let
       };
     };
   nixosModule =
-    { ... }:
+    { config, ... }:
     {
       home-manager = {
         useGlobalPkgs = true;
         useUserPackages = true;
-        users.${inputs.zeroq.devices.admin} = homeModule;
+        users."${config.xlib.device.username}" = homeModule;
         users.root = rootModule;
         sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
-        # extraSpecialArgs = {
-        #   inherit inputs;
-        #   inherit (config.device.type) deviceType;
-        # };
       };
     };
 in
diff --git a/home/modules/wsl.nix b/home/modules/wsl.nix
index 3c038f7..911d443 100644
--- a/home/modules/wsl.nix
+++ b/home/modules/wsl.nix
@@ -12,7 +12,9 @@ let
   externalPath = "${inputs.zeroq.dirs.wsl-home}";
 in
 {
-
+  imports = [
+    inputs.self.homeModules.minimal
+  ];
   xdg = {
     enable = true;
     autostart.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index cb350d0..9472ad8 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,5 @@
 { inputs, ... }@flakeContext:
 {
-  config,
   lib,
   ...
 }:
@@ -13,27 +12,4 @@
     home-manager.nixosModules.home-manager # home-manager module
     nix-index-database.nixosModules.nix-index # nix-index module
   ];
-
-  # defines global user
-  # config.users = {
-  #   users = {
-  #     "${config.xlib.device.username}" = {
-  #       isNormalUser = true;
-  #       description = "Jor Oqyude";
-  #       initialPassword = "1234";
-  #       extraGroups = [
-  #         "beets"
-  #         "audio"
-  #         "disk"
-  #         "gamemode"
-  #         "libvirtd"
-  #         "networkmanager"
-  #         "pipewire"
-  #         "qemu-libvirtd"
-  #         "wheel"
-  #         "immich"
-  #       ];
-  #     };
-  #   };
-  # };
 }
diff --git a/modules/essentials/services.nix b/modules/essentials/services.nix
index 4d215e6..11afd12 100755
--- a/modules/essentials/services.nix
+++ b/modules/essentials/services.nix
@@ -4,6 +4,6 @@
 }:
 {
   services = {
-    tailscale.enable = config.device.type != "wsl"; # true, if not wsl
+    tailscale.enable = config.xlib.device.type != "wsl"; # true, if not wsl
   };
 }