From 6dd6532d659dfae15816eedd1a4108eeeeff2781 Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Wed, 31 Dec 2025 11:36:00 +0300
Subject: [PATCH] 123

---
 deploy/default.nix        | 20 ++++++-------
 home/modules/external.nix | 40 ++++++++++----------------
 home/primary.nix          | 59 +++++++++++++--------------------------
 3 files changed, 42 insertions(+), 77 deletions(-)

diff --git a/deploy/default.nix b/deploy/default.nix
index ab79e44..f4383a9 100644
--- a/deploy/default.nix
+++ b/deploy/default.nix
@@ -1,5 +1,11 @@
 { inputs, ... }@flakeContext:
 let
+  mkDeploy = hostname: {
+    hostname = "${hostname}";
+    profiles.system = {
+      path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.${hostname};
+    };
+  };
   user = "${inputs.zeroq-deploy.devices.username}";
   server = "${inputs.zeroq-deploy.devices.server.hostname}";
   vds = "${inputs.zeroq-deploy.devices.vds.hostname}";
@@ -9,18 +15,8 @@ in
     sshUser = "${user}";
     user = "root";
     nodes = {
-      "${server}" = {
-        hostname = "${server}";
-        profiles.system = {
-          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.${server};
-        };
-      };
-      "${vds}" = {
-        hostname = "${vds}";
-        profiles.system = {
-          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations."${vds}";
-        };
-      };
+      "${server}" = mkDeploy "${server}";
+      "${vds}" = mkDeploy "${vds}";
     };
   };
   # This is highly advised, and will prevent many possible mistakes
diff --git a/home/modules/external.nix b/home/modules/external.nix
index cb26d8f..12e799c 100644
--- a/home/modules/external.nix
+++ b/home/modules/external.nix
@@ -5,31 +5,19 @@
   xlib,
   ...
 }:
+let
+  symlinksPaths = {
+    "${xlib.dirs.soptur-drive}/Games/PrismLauncher" = ".local/share/PrismLauncher";
+    "${xlib.dirs.vetymae-drive}/Users/oqyude/Storage" = "Storage";
+    "${xlib.dirs.vetymae-drive}/Users/oqyude/Music" = "Music";
+    "${xlib.dirs.vetymae-drive}/Users/oqyude/Misc" = "Misc";
+    "${xlib.dirs.vetymae-drive}/Users/oqyude/Vaults" = "Vaults";
+  };
+  mkLinks = lib.mapAttrs' (sourcePath: targetPath: {
+    name = targetPath;
+    value.source = config.lib.file.mkOutOfStoreSymlink "${sourcePath}";
+  }) symlinksPaths;
+in
 {
-  xdg = {
-    dataFile = {
-      "PrismLauncher" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.soptur-drive}/Games/PrismLauncher";
-        target = "PrismLauncher";
-      };
-    };
-  };
-  home.file = {
-    "Storage" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/Users/oqyude/Storage";
-      target = "Storage";
-    };
-    "Music" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/Users/oqyude/Music";
-      target = "Music";
-    };
-    "Misc" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/Users/oqyude/Misc";
-      target = "Misc";
-    };
-    "Vaults" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/Users/oqyude/Vaults";
-      target = "Vaults";
-    };
-  };
+  home.file = mkLinks;
 }
diff --git a/home/primary.nix b/home/primary.nix
index 5435ba4..b81598d 100644
--- a/home/primary.nix
+++ b/home/primary.nix
@@ -5,6 +5,25 @@
   xlib,
   ...
 }:
+let
+  symlinksPaths = {
+    # cfg
+    "${xlib.dirs.user-storage}/beets" = ".config/beets";
+    "${xlib.dirs.user-storage}/ludusavi" = ".config/ludusavi";
+    "${xlib.dirs.user-storage}/solaar" = ".config/solaar";
+    "${xlib.dirs.user-storage}/easyeffects" = ".config/easyeffects";
+    "${xlib.dirs.user-storage}/KeePassXC" = ".config/keepassxc";
+    "${xlib.dirs.user-storage}/v2rayN" = ".local/share/v2rayN";
+
+    # smthng
+    # "${xlib.dirs.soptur-drive}/AI/LM Studio" = ".lmstudio";
+    "${xlib.dirs.therima-drive}" = "External";
+  };
+  mkLinks = lib.mapAttrs' (sourcePath: targetPath: {
+    name = targetPath;
+    value.source = config.lib.file.mkOutOfStoreSymlink "${sourcePath}";
+  }) symlinksPaths;
+in
 {
   imports = [
     ./minimal.nix
@@ -16,34 +35,6 @@
   xdg = {
     enable = true;
     autostart.enable = true;
-    configFile = {
-      "beets" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/beets";
-        target = "beets";
-      };
-      "ludusavi" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/ludusavi";
-        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 = {
-      "v2rayN" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/v2rayN";
-        target = "v2rayN";
-      };
-    };
     userDirs = {
       enable = true;
       createDirectories = true;
@@ -57,18 +48,8 @@
       videos = "${config.home.homeDirectory}/Pictures/Videos";
     };
   };
-
   home = {
-    file = {
-      "External" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.therima-drive}";
-        target = "External";
-      };
-      "LM Studio" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.soptur-drive}/AI/LM Studio";
-        target = ".lmstudio";
-      };
-    };
+    file = mkLinks;
     pointerCursor = {
       enable = true;
       x11.enable = true;