diff --git a/hosts/kuro/default.nix b/hosts/kuro/default.nix
index d8405243..a66674cd 100644
--- a/hosts/kuro/default.nix
+++ b/hosts/kuro/default.nix
@@ -69,6 +69,7 @@
 
   ## Local config
   programs.ssh.startAgent = true;
+  services.openssh.startWhenNeeded = true;
 
   boot.loader.systemd-boot.enable = true;
   networking.networkmanager.enable = true;
diff --git a/hosts/shiro/default.nix b/hosts/shiro/default.nix
index e825a0db..cba62ef2 100644
--- a/hosts/shiro/default.nix
+++ b/hosts/shiro/default.nix
@@ -75,6 +75,7 @@
 
   ## Local config
   programs.ssh.startAgent = true;
+  services.openssh.startWhenNeeded = true;
 
   boot.loader.systemd-boot.enable = true;
   networking.wireless.enable = true;
diff --git a/modules/editors/vim.nix b/modules/editors/vim.nix
index 8c99d8b4..178e4851 100644
--- a/modules/editors/vim.nix
+++ b/modules/editors/vim.nix
@@ -17,6 +17,7 @@ in {
       neovim
     ];
 
+    # This is for non-neovim, so it loads my nvim config
     # env.VIMINIT = "let \\$MYVIMRC='\\$XDG_CONFIG_HOME/nvim/init.vim' | source \\$MYVIMRC";
 
     environment.shellAliases = {
diff --git a/modules/xdg.nix b/modules/xdg.nix
index 649922e6..50df31f2 100644
--- a/modules/xdg.nix
+++ b/modules/xdg.nix
@@ -28,10 +28,17 @@
         repl $XDG_CONFIG_HOME/aspell/en.prepl;
       '';
       CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
-      HISTFILE = "$XDG_DATA_HOME/bash/history";
-      INPUTRC = "$XDG_CACHE_HOME/readline/inputrc";
-      LESSHISTFILE = "$XDG_CACHE_HOME/lesshst";
-      WGETRC = "$XDG_CACHE_HOME/wgetrc";
+      HISTFILE        = "$XDG_DATA_HOME/bash/history";
+      INPUTRC         = "$XDG_CACHE_HOME/readline/inputrc";
+      LESSHISTFILE    = "$XDG_CACHE_HOME/lesshst";
+      WGETRC          = "$XDG_CACHE_HOME/wgetrc";
+
+      # Tools I don't use
+      # SUBVERSION_HOME = "$XDG_CONFIG_HOME/subversion";
+      # BZRPATH         = "$XDG_CONFIG_HOME/bazaar";
+      # BZR_PLUGIN_PATH = "$XDG_DATA_HOME/bazaar";
+      # BZR_HOME        = "$XDG_CACHE_HOME/bazaar";
+      # ICEAUTHORITY    = "$XDG_CACHE_HOME/ICEauthority";
     };
 
     # Move ~/.Xauthority out of $HOME