diff --git a/config/users/kat/default.nix b/config/users/kat/default.nix
index 4074b5f8..093a1e34 100644
--- a/config/users/kat/default.nix
+++ b/config/users/kat/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./ssh.nix
     ./desktop.nix
     ./gaming.nix
     ./network.nix
@@ -51,28 +52,6 @@
       };
     };
 
-    programs.ssh = {
-      enable = true;
-      controlMaster = "auto";
-      controlPersist = "10m";
-      hashKnownHosts = true;
-      matchBlocks = let
-        kat = {
-          forwardAgent = true;
-          extraOptions = {
-            RemoteForward =
-              "/run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra";
-          };
-          port = 62954;
-        };
-      in {
-        "athame" = { hostname = "athame.kittywit.ch"; } // kat;
-        "samhain" = { hostname = "192.168.1.135"; } // kat;
-        "yule" = { hostname = "192.168.1.92"; } // kat;
-        "boline" = { hostname = "boline.kittywit.ch"; } // kat;
-      };
-    };
-
     programs.bat.enable = true;
     programs.tmux = {
       enable = true;
diff --git a/config/users/kat/desktop.nix b/config/users/kat/desktop.nix
index fbc18e74..cfd9769b 100644
--- a/config/users/kat/desktop.nix
+++ b/config/users/kat/desktop.nix
@@ -48,7 +48,6 @@ in {
         unstable.google-chrome
         v4l-utils
         transmission-gtk
-        jdk11
         lm_sensors
         baresip
         psmisc
@@ -61,7 +60,6 @@ in {
         nitrogen
         terminator
         pavucontrol
-        appimage-run
         gparted
         scrot
         gimp-with-plugins
diff --git a/config/users/kat/ssh.nix b/config/users/kat/ssh.nix
new file mode 100644
index 00000000..4aba8df3
--- /dev/null
+++ b/config/users/kat/ssh.nix
@@ -0,0 +1,25 @@
+{ configs, pkgs, ... }:
+
+{
+  programs.ssh = {
+    enable = true;
+    controlMaster = "auto";
+    controlPersist = "10m";
+    hashKnownHosts = true;
+    matchBlocks = let
+      common = {
+        forwardAgent = true;
+        extraOptions = {
+          RemoteForward =
+            "/run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra";
+        };
+        port = 62954;
+      };
+    in {
+      "athame" = { hostname = "athame.kittywit.ch"; } // common;
+      "samhain" = { hostname = "192.168.1.135"; } // common;
+      "yule" = { hostname = "192.168.1.92"; } // common;
+      "boline" = { hostname = "boline.kittywit.ch"; } // common;
+    };
+  };
+}