123

home/server.nix

@@ -11,22 +11,6 @@ let
     "${xlib.dirs.storage}/ssh" = ".ssh/config";
     "${xlib.dirs.storage}/ssh" = ".ssh/known_hosts";
     "${xlib.dirs.storage}/beets" = ".config/beets";
-
-    # "hypr" = ".config/hypr";
-    # "waybar" = ".config/waybar";
-    # "rofi" = ".config/rofi";
-    # "yazi" = ".config/yazi";
-
-    # "alacritty" = ".config/alacritty";
-    # "zellij" = ".config/zellij";
-
-    # "zed" = ".config/zed";
-
-    # "lazygit" = ".config/lazygit";
-
-    # "fish/config.fish" = ".config/fish/config.fish";
-    # "git/.gitconfig" = ".gitconfig";
-    # "npm/.npmrc" = ".npmrc";
   };
 
   mkLinks = lib.mapAttrs' (sourcePath: targetPath: {
@@ -40,9 +24,10 @@ let
   musicPath = "${config.home.homeDirectory}/External/Music";
 in
 {
-  # imports = [
-  #   ./minimal.nix
-  # ];
+  imports = [
+    ./minimal.nix
+  ];
+  home.file = mkLinks;
   xdg = {
     # configFile = {
     #   "beets" = {
@@ -65,7 +50,6 @@ in
       videos = null;
     };
   };
-  home.file = mkLinks;
   # home = {
   #   file = {
   #     "ssh-config" = {

home/wsl.nix

@@ -1,30 +1,37 @@
 {
   config,
+  inputs,
+  lib,
   pkgs,
   xlib,
-  inputs,
   ...
 }:
 let
-  # Paths
-  beetsPath = "${xlib.dirs.wsl-storage}/beets";
-  externalPath = "${xlib.dirs.wsl-home}";
-  musicPath = "${config.home.homeDirectory}/External/Music";
+  symlinksPaths = {
+    "${config.home.homeDirectory}/External/Music" = "Music";
+    "${xlib.dirs.wsl-home}" = "External";
+    "${xlib.dirs.wsl-storage}/beets" = ".config/beets";
+  };
+  mkLinks = lib.mapAttrs' (sourcePath: targetPath: {
+    name = targetPath;
+    value.source = config.lib.file.mkOutOfStoreSymlink "${sourcePath}";
+  }) symlinksPaths;
 in
 {
   imports = [
     ./apps
     ./minimal.nix
   ];
+  home.file = mkLinks;
   xdg = {
     enable = true;
     autostart.enable = true;
-    configFile = {
-      "beets" = {
-        source = config.lib.file.mkOutOfStoreSymlink beetsPath;
-        target = "beets";
-      };
-    };
+    # configFile = {
+    #   "beets" = {
+    #     source = config.lib.file.mkOutOfStoreSymlink beetsPath;
+    #     target = "beets";
+    #   };
+    # };
     userDirs = {
       enable = true;
       createDirectories = false;
@@ -38,16 +45,4 @@ in
       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";
-      };
-    };
-  };
 }