Add SSH configuration, move more things to xdg dirs

modules/home/default.nix

@@ -5,7 +5,6 @@
     ./programs
     ./services
     ./settings
-    ./user
     ./variables
     ./wms
   ];

modules/home/programs/gui/obs/default.nix

@@ -12,6 +12,8 @@
       ];
     };
 
-    home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "data/.config/obs-studio" ];
+    home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+      with lib; with config.home; with config.xdg;
+      [ "data/${removePrefix "${homeDirectory}/" configHome}/obs-studio" ];
   };
 }

modules/home/programs/terminal/default.nix

@@ -14,6 +14,7 @@
     ./nh
     ./nix-index
     ./ranger
+    ./ssh
     ./tmux
     ./yt-dlp
     ./zoxide

modules/home/programs/terminal/direnv/default.nix

@@ -1,9 +1,11 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
   };
 
-  home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "data/.local/share/direnv" ];
+  home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+    with lib; with config.home; with config.xdg;
+    [ "data/${removePrefix "${homeDirectory}/" dataHome}/direnv" ];
 }

modules/home/programs/terminal/lazygit/default.nix

@@ -1,5 +1,7 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
   programs.lazygit.enable = true;
-  home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "state/.local/state/lazygit" ];
+  home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+    with lib; with config.home; with config.xdg;
+    [ "state/${removePrefix "${homeDirectory}/" stateHome}/lazygit" ];
 }

modules/home/programs/terminal/neovim/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   programs.neovim = {
     enable = true;
@@ -103,7 +103,7 @@
       set mouse=a
 
       set undofile
-      set undodir=$HOME/.local/share/nvim/undo
+      set undodir=${config.xdg.dataHome}/nvim/undo
       set undolevels=100
       set undoreload=10000
 
@@ -115,6 +115,8 @@
 
   home = {
     sessionVariables.MANPAGER = "nvim +Man!";
-    persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "state/.local/share/nvim/undo" ];
+    persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+      with lib; with config.home; with config.xdg;
+      [ "state/${removePrefix "${homeDirectory}/" dataHome}/nvim/undo" ];
   };
 }

modules/home/programs/terminal/ranger/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgsStable, ... }:
+{ config, lib, pkgsStable, ... }:
 {
   programs.ranger = {
     enable = true;
@@ -94,28 +94,28 @@
 
   # Ranger's bookmarks and necessary tools
   home = {
-    file = {
+    file = with lib; with config.home; with config.xdg; with config.xdg.userDirs; with config.xdg.userDirs.extraConfig; {
-      ".local/share/ranger/bookmarks".text = ''
+      "${removePrefix "${homeDirectory}/" dataHome}/ranger/bookmarks".text = ''
         # Local files
-        h:${config.home.homeDirectory}
+        h:${homeDirectory}
-        k:${config.home.homeDirectory}/Keepers
+        k:${XDG_KEEPERS_DIR}
-        d:${config.home.homeDirectory}/Downloads
+        d:${download}
-        j:${config.home.homeDirectory}/Documents
+        j:${documents}
-        p:${config.home.homeDirectory}/Photos
+        p:${pictures}
-        v:${config.home.homeDirectory}/Videos
+        v:${videos}
-        n:${config.home.homeDirectory}/Projects/nixos-config
+        n:${XDG_PROJECTS_DIR}/nixos-config
-        c:${config.home.homeDirectory}/.config
+        c:${configHome}
-        l:${config.home.homeDirectory}/.local
+        l:${dataHome}
-        q:/persist
+        q:${XDG_PERSIST_DIR}
         w:/mnt
 
         # Remote files
-        N:${config.home.homeDirectory}/Network
+        N:${XDG_NETWORK_DIR}/
-        H:${config.home.homeDirectory}/Network/Midas/
+        H:${XDG_NETWORK_DIR}/Midas/
-        K:${config.home.homeDirectory}/Network/Midas/Files
+        K:${XDG_NETWORK_DIR}/Midas/Files
-        M:${config.home.homeDirectory}/Network/Midas/Music
+        M:${XDG_NETWORK_DIR}/Midas/Music
-        V:${config.home.homeDirectory}/Network/Midas/Videos
+        V:${XDG_NETWORK_DIR}/Midas/Videos
-        P:${config.home.homeDirectory}/Network/Midas/Photos
+        P:${XDG_NETWORK_DIR}/Midas/Photos
       '';
     };
     packages = with pkgsStable; [

modules/home/programs/terminal/ssh/default.nix

@@ -1,7 +1,24 @@
-{ ... }:
+{ config, lib, ... }:
 {
   programs.ssh = {
     enable = true;
     addKeysToAgent = "yes";
+    compression = true;
+    matchBlocks = with lib.hm.dag; {
+      nixfox = {
+        host = "*.nixfox.ca";
+        user = config.home.username;
+      };
+      midas = entryAfter [ "nixfox" ] {
+        hostname = "sv.nixfox.ca";
+      };
+      kitty = entryAfter [ "nixfox" ] {
+        hostname = "sv.nixfox.ca";
+        port = 2222;
+      };
+      prophet = entryAfter [ "nixfox" ] {
+        hostname = "mx.nixfox.ca";
+      };
+    };
   };
 }

modules/home/programs/terminal/zoxide/default.nix

@@ -1,9 +1,11 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
   programs.zoxide.enable = true;
 
   home = {
     shellAliases.cd = "z";
-    persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "state/.local/share/zoxide" ];
+    persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+      with lib; with config.home; with config.xdg;
+      [ "state/${removePrefix "${homeDirectory}/" dataHome}/zoxide" ];
   };
 }

modules/home/services/mpd/default.nix

@@ -5,7 +5,7 @@
       mpd = {
         enable = true;
         network.startWhenNeeded = true;
-        musicDirectory = "${config.home.homeDirectory}/Network/Midas/Music/NixBops";
+        musicDirectory = "${config.xdg.userDirs.extraConfig.XDG_NETWORK_DIR}/Midas/Music/NixBops";
         playlistDirectory = "${config.services.mpd.musicDirectory}/Playlists";
         extraConfig = ''
           audio_output {
@@ -18,6 +18,8 @@
       mpd-discord-rpc.enable = true;
     };
 
-    home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "state/.local/share/mpd" ];
+    home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+      with lib; with config.home; with config.xdg;
+      [ "state/${removePrefix "${homeDirectory}/" dataHome}/mpd" ];
   };
 }

modules/home/settings/dconf/default.nix

@@ -8,7 +8,8 @@
         uris = [ "qemu:///system" ];
       };
     };
-    home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg;
+    home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
-      [ "games/${removePrefix "${homeDirectory}/" stateHome}/dconf" ];
+      with lib; with config.home; with config.xdg;
+      [ "state/${removePrefix "${homeDirectory}/" configHome}/dconf" ];
   };
 }

modules/home/settings/default.nix

@@ -11,6 +11,7 @@
     ./nix
     ./nixgl
     ./qt
+    ./user
     ./xdg
   ];
 }

modules/home/settings/xdg/folders/default.nix

@@ -13,6 +13,7 @@
     extraConfig = {
       XDG_GAMES_DIR = "${homeDirectory}/Games";
       XDG_KEEPERS_DIR = "${homeDirectory}/Keepers";
+      XDG_NETWORK_DIR = "${homeDirectory}/Network";
       XDG_PERSIST_DIR = if !config.targets.genericLinux.enable then "/persist${homeDirectory}" else "${homeDirectory}/.stow";
       XDG_PROJECTS_DIR = "${homeDirectory}/Projects";
       XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";