diff --git a/flake.lock b/flake.lock
index 2576bc6..92d8214 100755
--- a/flake.lock
+++ b/flake.lock
@@ -358,7 +358,6 @@
         "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix",
         "zapret": "zapret",
-        "zeroq": "zeroq",
         "zeroq-credentials": "zeroq-credentials"
       }
     },
@@ -412,21 +411,6 @@
         "type": "github"
       }
     },
-    "zeroq": {
-      "locked": {
-        "lastModified": 1754248619,
-        "narHash": "sha256-/6BUL/pJnrQZd2S+a+UbF1ByiR5xQfdQTokUGZUyJGU=",
-        "ref": "refs/heads/master",
-        "rev": "44ba9d7980c87f8e90b7351f73dfe3483b0226b9",
-        "revCount": 2,
-        "type": "git",
-        "url": "ssh://git@github.com/oqyude/zeroq.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://git@github.com/oqyude/zeroq.git"
-      }
-    },
     "zeroq-credentials": {
       "locked": {
         "lastModified": 1753537856,
diff --git a/flake.nix b/flake.nix
index ba033a5..217e7f0 100755
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
 
     # My
-    zeroq.url = "git+ssh://git@github.com/oqyude/zeroq.git"; # flake of variables
+    #zeroq.url = "git+ssh://git@github.com/oqyude/zeroq.git"; # flake of variables
     zeroq-credentials.url = "git+ssh://git@github.com/oqyude/zeroq-credentials.git"; # flake of creds
     zapret.url = "github:oqyude/zapret-easyflake"; # stupid flake of zapret
 
diff --git a/home/default.nix b/home/default.nix
index 3177507..d22cfd4 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -10,7 +10,7 @@ let
     }:
     {
       imports = [
-        (./type + "/${xlib.device.type}.nix")
+        (./. + "/${xlib.device.type}.nix")
         #inputs.self.homeModules."${xlib.device.type}" # -> (./type + "/${xlib.device.type}.nix")
       ];
       home = {
@@ -30,7 +30,7 @@ let
     }:
     {
       imports = [
-        (./type + "/${xlib.device.type}.nix")
+        (./. + "/${xlib.device.type}.nix")
         #inputs.self.homeModules."${xlib.device.type}"
       ];
       home = {
diff --git a/home/type/minimal.nix b/home/minimal.nix
similarity index 83%
rename from home/type/minimal.nix
rename to home/minimal.nix
index a77ea4b..9b14bef 100644
--- a/home/type/minimal.nix
+++ b/home/minimal.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   pkgs,
diff --git a/home/main.nix b/home/old/main.nix
similarity index 100%
rename from home/main.nix
rename to home/old/main.nix
diff --git a/home/root.nix b/home/old/root.nix
similarity index 100%
rename from home/root.nix
rename to home/old/root.nix
diff --git a/home/old/server.nix b/home/old/server.nix
new file mode 100755
index 0000000..3f7b1e4
--- /dev/null
+++ b/home/old/server.nix
@@ -0,0 +1,78 @@
+{ inputs, ... }@flakeContext:
+let
+  homeModule =
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
+    let
+      # Paths
+      beetsPath = "${config.xlib.dirs.storage}/beets/linux";
+      sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
+      musicPath = "${config.home.homeDirectory}/External/Music";
+    in
+    {
+      imports = [
+        ./minimal.nix
+      ];
+      xdg = {
+        configFile = {
+          "beets" = {
+            source = config.lib.file.mkOutOfStoreSymlink beetsPath;
+            target = "beets";
+          };
+        };
+        enable = true;
+        autostart.enable = true;
+        userDirs = {
+          enable = true;
+          createDirectories = false;
+          desktop = null;
+          documents = null;
+          download = null;
+          music = null;
+          pictures = null;
+          publicShare = null;
+          templates = null;
+          videos = null;
+        };
+      };
+      home = {
+        file = {
+          ".ssh" = {
+            source = config.lib.file.mkOutOfStoreSymlink sshPath;
+            target = ".ssh";
+          };
+          "Music" = {
+            source = config.lib.file.mkOutOfStoreSymlink musicPath;
+            target = "${config.home.homeDirectory}/Music";
+          };
+        };
+        username = "${config.xlib.devices.admin}";
+      };
+
+    };
+  nixosModule =
+    { ... }:
+    {
+      home-manager = {
+        useGlobalPkgs = true;
+        useUserPackages = true;
+        users.${config.xlib.devices.admin} = homeModule;
+        sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
+      };
+    };
+in
+(
+  (inputs.home-manager.lib.homeManagerConfiguration {
+    modules = [
+      homeModule
+    ];
+    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+  })
+  // {
+    inherit nixosModule;
+  }
+)
diff --git a/home/old/wsl.nix b/home/old/wsl.nix
new file mode 100755
index 0000000..87f0655
--- /dev/null
+++ b/home/old/wsl.nix
@@ -0,0 +1,91 @@
+{ inputs, ... }@flakeContext:
+let
+  homeModule =
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
+    let
+      # Paths
+      beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux";
+      #sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
+      musicPath = "${config.home.homeDirectory}/External/Music";
+      externalPath = "${config.xlib.dirs.wsl-home}";
+    in
+    {
+      imports = [
+        inputs.self.homeModules.default
+      ];
+      xdg = {
+        enable = true;
+        autostart.enable = true;
+        configFile = {
+          "beets" = {
+            source = config.lib.file.mkOutOfStoreSymlink beetsPath;
+            target = "beets";
+          };
+        };
+        # userDirs = {
+        #   enable = false;
+        #   createDirectories = false;
+        #   desktop = null;
+        #   documents = null;
+        #   download = null;
+        #   music = null;
+        #   pictures = null;
+        #   publicShare = null;
+        #   templates = null;
+        #   videos = null;
+        # };
+      };
+
+      home = {
+        #username = "${config.xlib.devices.admin}";
+        file = {
+          "External" = {
+            source = config.lib.file.mkOutOfStoreSymlink externalPath;
+            target = "External";
+          };
+          "Music" = {
+            source = config.lib.file.mkOutOfStoreSymlink musicPath;
+            target = "${config.home.homeDirectory}/Music";
+          };
+        };
+        # pointerCursor = {
+        #   enable = true;
+        #   x11.enable = true;
+        #   gtk.enable = true;
+        #   size = 24;
+        #   name = "Qogir";
+        #   package = pkgs.qogir-icon-theme;
+        # };
+      };
+    };
+  nixosModule =
+    { config, ... }:
+    {
+      home-manager = {
+        useGlobalPkgs = true;
+        useUserPackages = true;
+        users.${config.xlib.devices.admin} = homeModule;
+        # sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
+        # extraSpecialArgs = {
+        #   inherit (config.networking) hostName;
+        # };
+      };
+
+    };
+in
+(
+  (inputs.home-manager.lib.homeManagerConfiguration {
+    modules = [
+      homeModule
+    ];
+    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+  })
+  // {
+    inherit nixosModule;
+  }
+)
diff --git a/home/primary.nix b/home/primary.nix
new file mode 100644
index 0000000..7eb3d91
--- /dev/null
+++ b/home/primary.nix
@@ -0,0 +1,83 @@
+{
+  config,
+  lib,
+  pkgs,
+  xlib,
+  ...
+}:
+{
+  imports = [ ] ++ (builtins.attrValues inputs.self.homeModules);
+  xdg = {
+    enable = true;
+    autostart.enable = true;
+    configFile = {
+      "beets" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/beets/linux";
+        target = "beets";
+      };
+      "ludusavi" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/ludusavi/cfg";
+        target = "ludusavi";
+      };
+      "solaar" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/solaar";
+        target = "solaar";
+      };
+      "easyeffects" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/easyeffects";
+        target = "easyeffects";
+      };
+      "keepassxc" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/KeePassXC";
+        target = "keepassxc";
+      };
+    };
+    dataFile = {
+      "PrismLauncher" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/Games/PrismLauncher";
+        target = "PrismLauncher";
+      };
+      "v2rayN" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/v2rayN";
+        target = "v2rayN";
+      };
+    };
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+      desktop = "${config.xdg.dataHome}/desktop";
+      documents = null;
+      download = "${config.home.homeDirectory}/Downloads";
+      music = "${config.home.homeDirectory}/Music";
+      pictures = "${config.home.homeDirectory}/Pictures";
+      publicShare = "${config.home.homeDirectory}/Misc/Public";
+      templates = null;
+      videos = "${config.home.homeDirectory}/Pictures/Videos";
+    };
+  };
+
+  home = {
+    file = {
+      "ssh" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/ssh/${config.home.username}";
+        target = ".ssh";
+      };
+      "External" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.therima-drive}";
+        target = "External";
+      };
+      "LM Studio" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/AI/LM Studio";
+        target = ".lmstudio";
+      };
+    };
+    pointerCursor = {
+      enable = true;
+      x11.enable = true;
+      gtk.enable = true;
+      size = 24;
+      name = "Qogir";
+      package = pkgs.qogir-icon-theme;
+    };
+  };
+}
diff --git a/home/server.nix b/home/server.nix
old mode 100755
new mode 100644
index 51b97d5..b1d7823
--- a/home/server.nix
+++ b/home/server.nix
@@ -1,78 +1,52 @@
-{ inputs, ... }@flakeContext:
+{
+  config,
+  lib,
+  pkgs,
+  xlib,
+  ...
+}:
 let
-  homeModule =
-    {
-      config,
-      lib,
-      pkgs,
-      ...
-    }:
-    let
-      # Paths
-      beetsPath = "${config.xlib.dirs.storage}/beets/linux";
-      sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
-      musicPath = "${config.home.homeDirectory}/External/Music";
-    in
-    {
-      imports = [
-        inputs.self.homeModules.default
-      ];
-      xdg = {
-        configFile = {
-          "beets" = {
-            source = config.lib.file.mkOutOfStoreSymlink beetsPath;
-            target = "beets";
-          };
-        };
-        enable = true;
-        autostart.enable = true;
-        userDirs = {
-          enable = true;
-          createDirectories = false;
-          desktop = null;
-          documents = null;
-          download = null;
-          music = null;
-          pictures = null;
-          publicShare = null;
-          templates = null;
-          videos = null;
-        };
-      };
-      home = {
-        file = {
-          ".ssh" = {
-            source = config.lib.file.mkOutOfStoreSymlink sshPath;
-            target = ".ssh";
-          };
-          "Music" = {
-            source = config.lib.file.mkOutOfStoreSymlink musicPath;
-            target = "${config.home.homeDirectory}/Music";
-          };
-        };
-        username = "${config.xlib.devices.admin}";
-      };
-
-    };
-  nixosModule =
-    { ... }:
-    {
-      home-manager = {
-        useGlobalPkgs = true;
-        useUserPackages = true;
-        users.${config.xlib.devices.admin} = homeModule;
-        sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
-      };
-    };
+  # Paths
+  beetsPath = "${xlib.dirs.storage}/beets/linux";
+  sshPath = "${xlib.dirs.storage}/ssh/${xlib.devices.server.hostname}";
+  musicPath = "${config.home.homeDirectory}/External/Music";
 in
-(
-  (inputs.home-manager.lib.homeManagerConfiguration {
-    modules = [
-      homeModule
-    ];
-    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-  })
-  // {
-    inherit nixosModule;
-  }
-)
+{
+  imports = [
+    ./minimal.nix
+  ];
+  xdg = {
+    configFile = {
+      "beets" = {
+        source = config.lib.file.mkOutOfStoreSymlink beetsPath;
+        target = "beets";
+      };
+    };
+    enable = true;
+    autostart.enable = true;
+    userDirs = {
+      enable = true;
+      createDirectories = false;
+      desktop = null;
+      documents = null;
+      download = null;
+      music = null;
+      pictures = null;
+      publicShare = null;
+      templates = null;
+      videos = null;
+    };
+  };
+  home = {
+    file = {
+      ".ssh" = {
+        source = config.lib.file.mkOutOfStoreSymlink sshPath;
+        target = ".ssh";
+      };
+      "Music" = {
+        source = config.lib.file.mkOutOfStoreSymlink musicPath;
+        target = "${config.home.homeDirectory}/Music";
+      };
+    };
+  };
+}
diff --git a/home/type/wsl.nix b/home/type/wsl.nix
deleted file mode 100644
index 0f79aeb..0000000
--- a/home/type/wsl.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-let
-  # Paths
-  beetsPath = "${xlib.dirs.wsl-storage}/beets/linux";
-  #sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}";
-  musicPath = "${config.home.homeDirectory}/External/Music";
-  externalPath = "${xlib.dirs.wsl-home}";
-in
-{
-  imports = [
-    ./minimal.nix
-  ];
-  xdg = {
-    enable = true;
-    autostart.enable = true;
-    configFile = {
-      "beets" = {
-        source = config.lib.file.mkOutOfStoreSymlink beetsPath;
-        target = "beets";
-      };
-    };
-    # userDirs = {
-    #   enable = false;
-    #   createDirectories = false;
-    #   desktop = null;
-    #   documents = null;
-    #   download = null;
-    #   music = null;
-    #   pictures = null;
-    #   publicShare = null;
-    #   templates = null;
-    #   videos = null;
-    # };
-  };
-  home = {
-    file = {
-      "External" = {
-        source = config.lib.file.mkOutOfStoreSymlink externalPath;
-        target = "External";
-      };
-      "Music" = {
-        source = config.lib.file.mkOutOfStoreSymlink musicPath;
-        target = "${config.home.homeDirectory}/Music";
-      };
-    };
-    # pointerCursor = {
-    #   enable = true;
-    #   x11.enable = true;
-    #   gtk.enable = true;
-    #   size = 24;
-    #   name = "Qogir";
-    #   package = pkgs.qogir-icon-theme;
-    # };
-  };
-}
diff --git a/home/wsl.nix b/home/wsl.nix
old mode 100755
new mode 100644
index 87f0655..a20150f
--- a/home/wsl.nix
+++ b/home/wsl.nix
@@ -1,91 +1,60 @@
-{ inputs, ... }@flakeContext:
+{
+  config,
+  pkgs,
+  xlib,
+  ...
+}:
 let
-  homeModule =
-    {
-      config,
-      lib,
-      pkgs,
-      ...
-    }:
-    let
-      # Paths
-      beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux";
-      #sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
-      musicPath = "${config.home.homeDirectory}/External/Music";
-      externalPath = "${config.xlib.dirs.wsl-home}";
-    in
-    {
-      imports = [
-        inputs.self.homeModules.default
-      ];
-      xdg = {
-        enable = true;
-        autostart.enable = true;
-        configFile = {
-          "beets" = {
-            source = config.lib.file.mkOutOfStoreSymlink beetsPath;
-            target = "beets";
-          };
-        };
-        # userDirs = {
-        #   enable = false;
-        #   createDirectories = false;
-        #   desktop = null;
-        #   documents = null;
-        #   download = null;
-        #   music = null;
-        #   pictures = null;
-        #   publicShare = null;
-        #   templates = null;
-        #   videos = null;
-        # };
-      };
-
-      home = {
-        #username = "${config.xlib.devices.admin}";
-        file = {
-          "External" = {
-            source = config.lib.file.mkOutOfStoreSymlink externalPath;
-            target = "External";
-          };
-          "Music" = {
-            source = config.lib.file.mkOutOfStoreSymlink musicPath;
-            target = "${config.home.homeDirectory}/Music";
-          };
-        };
-        # pointerCursor = {
-        #   enable = true;
-        #   x11.enable = true;
-        #   gtk.enable = true;
-        #   size = 24;
-        #   name = "Qogir";
-        #   package = pkgs.qogir-icon-theme;
-        # };
-      };
-    };
-  nixosModule =
-    { config, ... }:
-    {
-      home-manager = {
-        useGlobalPkgs = true;
-        useUserPackages = true;
-        users.${config.xlib.devices.admin} = homeModule;
-        # sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
-        # extraSpecialArgs = {
-        #   inherit (config.networking) hostName;
-        # };
-      };
-
-    };
+  # Paths
+  beetsPath = "${xlib.dirs.wsl-storage}/beets/linux";
+  #sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}";
+  musicPath = "${config.home.homeDirectory}/External/Music";
+  externalPath = "${xlib.dirs.wsl-home}";
 in
-(
-  (inputs.home-manager.lib.homeManagerConfiguration {
-    modules = [
-      homeModule
-    ];
-    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-  })
-  // {
-    inherit nixosModule;
-  }
-)
+{
+  imports = [
+    ./minimal.nix
+  ];
+  xdg = {
+    enable = true;
+    autostart.enable = true;
+    configFile = {
+      "beets" = {
+        source = config.lib.file.mkOutOfStoreSymlink beetsPath;
+        target = "beets";
+      };
+    };
+    # userDirs = {
+    #   enable = false;
+    #   createDirectories = false;
+    #   desktop = null;
+    #   documents = null;
+    #   download = null;
+    #   music = null;
+    #   pictures = null;
+    #   publicShare = null;
+    #   templates = null;
+    #   videos = null;
+    # };
+  };
+  home = {
+    file = {
+      "External" = {
+        source = config.lib.file.mkOutOfStoreSymlink externalPath;
+        target = "External";
+      };
+      "Music" = {
+        source = config.lib.file.mkOutOfStoreSymlink musicPath;
+        target = "${config.home.homeDirectory}/Music";
+      };
+    };
+    # pointerCursor = {
+    #   enable = true;
+    #   x11.enable = true;
+    #   gtk.enable = true;
+    #   size = 24;
+    #   name = "Qogir";
+    #   package = pkgs.qogir-icon-theme;
+    # };
+  };
+}
diff --git a/modules/software/beets/default.nix b/modules/software/beets/default.nix
index 3109eea..6fa311d 100755
--- a/modules/software/beets/default.nix
+++ b/modules/software/beets/default.nix
@@ -20,12 +20,12 @@ let
 in
 {
   systemd.tmpfiles.rules = [
-    "z /mnt/beets 0700 ${config.xlib.devices.admin} users -" # beets absolute paths
+    "z /mnt/beets 0700 ${config.xlib.device.username} users -" # beets absolute paths
   ];
 
   users = {
     users = {
-      "${config.xlib.devices.admin}" = {
+      "${config.xlib.device.username}" = {
         packages = [
           beetsEnv
           pkgs.mp3gain