diff --git a/nixosConfigurations/hosts/laptop.nix b/nixosConfigurations/hosts/laptop.nix
index 63297f7..0501723 100755
--- a/nixosConfigurations/hosts/laptop.nix
+++ b/nixosConfigurations/hosts/laptop.nix
@@ -15,27 +15,10 @@ let
         type = "primary";
       };
 
-      imports =
-        with inputs;
-        [
-          ./hardware/laptop.nix
-          ./hardware/logitech.nix
-          self.nixosModules.default
-          #nixos-hardware.nixosModules.asus-fa506ic
-
-          self.nixosModules.software.wine
-          self.nixosModules.software.beets
-          self.nixosModules.desktop
-          sops-nix.nixosModules.sops
-        ]
-        ++ builtins.attrValues inputs.self.nixosModules.extra.self;
-
-      home-manager = {
-        extraSpecialArgs = {
-          xlib = config.xlib;
-        };
-      };
-
+      imports = [
+        ./hardware/laptop.nix
+        ./hardware/logitech.nix
+      ];
       fileSystems = {
         "${config.xlib.dirs.therima-drive}" = {
           device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
@@ -63,18 +46,6 @@ let
             #"x-systemd.device-timeout=0"
           ];
         };
-        "/mnt/beets/music" = {
-          device = "/home/${config.xlib.device.username}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
-          options = [
-            "bind"
-            #"uid=1000"
-            #"gid=1000"
-            "fmask=0077"
-            "dmask=0077"
-            "nofail"
-            #"x-systemd.device-timeout=0"
-          ];
-        };
       };
 
       boot = {
@@ -189,6 +160,7 @@ in
 inputs.nixpkgs.lib.nixosSystem {
   modules = [
     nixosModule
+    inputs.self.nixosModules.default
   ];
   system = "x86_64-linux";
   specialArgs = {
diff --git a/nixosConfigurations/hosts/mini-laptop.nix b/nixosConfigurations/hosts/mini-laptop.nix
index e7069b4..d0511dd 100755
--- a/nixosConfigurations/hosts/mini-laptop.nix
+++ b/nixosConfigurations/hosts/mini-laptop.nix
@@ -16,25 +16,17 @@ let
         hostname = "lamet";
       };
 
-      imports = with inputs; [
-        self.homeConfigurations.default.nixosModule
-        self.nixosModules.default
-
-        nixos-hardware.nixosModules.chuwi-minibook-x
+      imports = [
+        inputs.nixos-hardware.nixosModules.chuwi-minibook-x
       ];
 
-      home-manager = {
-        extraSpecialArgs = {
-          xlib = config.xlib;
-        };
-      };
-
       hardware.intel-gpu-tools.enable = true;
     };
 in
 inputs.nixpkgs.lib.nixosSystem {
   modules = with inputs; [
     nixosModule
+    self.nixosModules.default
   ];
   system = "x86_64-linux";
   specialArgs = {
diff --git a/nixosConfigurations/hosts/mini-pc.nix b/nixosConfigurations/hosts/mini-pc.nix
index 76df07d..b6f6f18 100755
--- a/nixosConfigurations/hosts/mini-pc.nix
+++ b/nixosConfigurations/hosts/mini-pc.nix
@@ -21,20 +21,8 @@ let
         ./hardware/mini-pc.nix
         ./hardware/logitech.nix
         self.nixosModules.default
-
-        #         self.nixosModules.software.wine
-        #         self.nixosModules.software.beets
-        #self.nixosModules.extra.self.fingerprint
-        # self.homeConfigurations.main.nixosModule
-        # self.homeConfigurations.root.nixosModule
       ];
 
-      home-manager = {
-        extraSpecialArgs = {
-          xlib = config.xlib;
-        };
-      };
-
       sops = {
         defaultSopsFile = ./secrets/example.yaml;
         age.keyFile = "/var/lib/sops-nix/key.txt";
@@ -51,7 +39,6 @@ let
             "fmask=0007"
             "dmask=0007"
             "nofail"
-            #"x-systemd.device-timeout=0"
           ];
         };
         "${config.xlib.dirs.vetymae-drive}" = {
@@ -64,19 +51,6 @@ let
             "fmask=0007"
             "dmask=0007"
             "nofail"
-            #"x-systemd.device-timeout=0"
-          ];
-        };
-        "/mnt/beets/music" = {
-          device = "/home/${config.xlib.device.username}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
-          options = [
-            "bind"
-            #"uid=1000"
-            #"gid=1000"
-            "fmask=0077"
-            "dmask=0077"
-            "nofail"
-            #"x-systemd.device-timeout=0"
           ];
         };
       };
diff --git a/nixosConfigurations/hosts/server.nix b/nixosConfigurations/hosts/server.nix
index d588401..09f9171 100755
--- a/nixosConfigurations/hosts/server.nix
+++ b/nixosConfigurations/hosts/server.nix
@@ -17,12 +17,6 @@ let
         ./hardware/server.nix
       ];
 
-      home-manager = {
-        extraSpecialArgs = {
-          xlib = config.xlib;
-        };
-      };
-
       boot = {
         kernelPackages = pkgs.linuxPackages_xanmod_stable;
         hardwareScan = true;
@@ -47,7 +41,7 @@ let
           fsType = "ext4";
           options = [
             #"nofail"
-            "x-systemd.device-timeout=0"
+            #"x-systemd.device-timeout=0"
           ];
         };
         # Archive drive
@@ -56,24 +50,11 @@ let
           fsType = "exfat";
           options = [
             "nofail"
-            "x-systemd.device-timeout=0"
+            #"x-systemd.device-timeout=0"
             "uid=1000"
             "gid=1000"
           ];
         };
-        # beets
-        "/mnt/beets/music" = {
-          device = "${config.xlib.dirs.server-home}/Music";
-          options = [
-            "bind"
-            "uid=1000"
-            "gid=1000"
-            "fmask=0007"
-            "dmask=0007"
-            "nofail"
-            "x-systemd.device-timeout=0"
-          ];
-        };
       };
 
       services = {
@@ -116,12 +97,10 @@ let
     };
 in
 inputs.nixpkgs.lib.nixosSystem {
-  modules = with inputs; [
+  modules = [
     nixosModule
 
-    self.nixosModules.default
-    self.homeConfigurations.default.nixosModule
-    sops-nix.nixosModules.sops
+    inputs.self.nixosModules.default
   ];
   system = "x86_64-linux";
   specialArgs = {
diff --git a/nixosConfigurations/hosts/vds.nix b/nixosConfigurations/hosts/vds.nix
index b780362..ea28b3b 100755
--- a/nixosConfigurations/hosts/vds.nix
+++ b/nixosConfigurations/hosts/vds.nix
@@ -20,18 +20,10 @@ let
 
         ./disko/vds.nix
         ./hardware/vds.nix
-        inputs.disko.nixosModules.disko
 
         inputs.self.nixosModules.default
-        inputs.self.homeConfigurations.default.nixosModule
       ];
 
-      home-manager = {
-        extraSpecialArgs = {
-          xlib = config.xlib;
-        };
-      };
-
       boot = {
         kernelPackages = pkgs.linuxPackages_xanmod_stable;
         hardwareScan = true;
diff --git a/nixosConfigurations/hosts/wsl.nix b/nixosConfigurations/hosts/wsl.nix
index f2f14f5..c421c11 100755
--- a/nixosConfigurations/hosts/wsl.nix
+++ b/nixosConfigurations/hosts/wsl.nix
@@ -16,33 +16,8 @@ let
 
       imports = [
         inputs.nixos-wsl.nixosModules.default
-
-        inputs.self.homeConfigurations.default.nixosModule
-        inputs.self.nixosModules.default
       ];
 
-      home-manager = {
-        extraSpecialArgs = {
-          xlib = config.xlib;
-        };
-      };
-
-      fileSystems = {
-        # beets
-        "/mnt/beets/music" = {
-          device = "${config.xlib.dirs.wsl-home}/Music";
-          options = [
-            "bind"
-            "uid=1000"
-            "gid=1000"
-            "fmask=0007"
-            "dmask=0007"
-            "nofail"
-            "x-systemd.device-timeout=0"
-          ];
-        };
-      };
-
       #zramSwap.enable = true;
       services = {
         journald = {
@@ -71,6 +46,7 @@ in
 inputs.nixpkgs.lib.nixosSystem {
   modules = [
     nixosModule
+    inputs.self.nixosModules.default
   ];
   system = "x86_64-linux";
   specialArgs = {
diff --git a/nixosModules/base.nix b/nixosModules/base.nix
index c961974..8f9cbb5 100755
--- a/nixosModules/base.nix
+++ b/nixosModules/base.nix
@@ -17,9 +17,17 @@
     home-manager.nixosModules.home-manager # home-manager module
     nix-index-database.nixosModules.nix-index # nix-index module
     grub2-themes.nixosModules.default # grub2 themes module
-    sops-nix.nixosModules.sops
-    self.homeConfigurations.default.nixosModule
+    sops-nix.nixosModules.sops # sops module
+    self.homeConfigurations.default.nixosModule # default homeConfigurations
+    disko.nixosModules.disko # disko module
   ];
+
+  home-manager = {
+    extraSpecialArgs = {
+      xlib = config.xlib;
+    };
+  };
+
   _module.args = {
     inputs = inputs;
     xlib = config.xlib;
diff --git a/nixosModules/software/beets/default.nix b/nixosModules/software/beets/default.nix
index 4e36f0a..5c42026 100755
--- a/nixosModules/software/beets/default.nix
+++ b/nixosModules/software/beets/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  xlib,
   ...
 }:
 let
@@ -19,12 +20,12 @@ let
 in
 {
   systemd.tmpfiles.rules = [
-    "z /mnt/beets 0700 ${config.xlib.device.username} users -" # beets absolute paths
+    "z /mnt/beets 0700 ${xlib.device.username} users -" # beets absolute paths
   ];
 
   users = {
     users = {
-      "${config.xlib.device.username}" = {
+      "${xlib.device.username}" = {
         packages = [
           beetsEnv
           pkgs.mp3gain
@@ -34,4 +35,16 @@ in
       };
     };
   };
+  fileSystems."/mnt/beets/music" = {
+    device = "/home/${xlib.device.username}/Music"; # "${xlib.dirs.vetymae-drive}/Users/User/Music"
+    options = [
+      "bind"
+      "uid=1000"
+      "gid=1000"
+      "fmask=0077"
+      "dmask=0077"
+      "nofail"
+      #"x-systemd.device-timeout=0"
+    ];
+  };
 }