diff --git a/modules/workspace/gpg.nix b/modules/workspace/gpg.nix
index b11a4ff..bf9909a 100644
--- a/modules/workspace/gpg.nix
+++ b/modules/workspace/gpg.nix
@@ -8,9 +8,8 @@
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentryFlavor = "gnome3";
+      pinentryFlavor = "gtk2";
       sshKeys = [
-        # "E6A6377C3D0827C36428A290199FDB3B91414AFE"
         "7A7130ABF128CC2C32B3D6AD27515056B0193CE1"
       ];
     };
diff --git a/modules/workspace/ssh.nix b/modules/workspace/ssh.nix
index c2d2b5f..a6509df 100644
--- a/modules/workspace/ssh.nix
+++ b/modules/workspace/ssh.nix
@@ -1,19 +1,22 @@
 { pkgs, lib, config, ... }: {
 
+  services.openssh = {
+    enable = true;
+    passwordAuthentication = false;
+    permitRootLogin = "no";
+    forwardX11 = true;
+    extraConfig = "StreamLocalBindUnlink yes";
+    ports = [ 22 ];
+  };
+
   home-manager.users.alukard = {
-    # programs.ssh = {
-    #   enable = true;
-    #   forwardAgent = true;
-    #   extraOptions = {
-    #     # Host = "localhost";
-    #     AddKeysToAgent = "ask";
-    #   }
-    # };
-    home.file.".ssh/config".text = ''
-      Host localhost
-      ForwardAgent yes
-      AddKeysToAgent ask
-      Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
-    '';
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        "*" = {
+          compression = false;
+        };
+      };
+    };
   };
 }