diff --git a/config/hosts/athame/mail.nix b/config/hosts/athame/mail.nix
index c0a1a62e..2da73b9c 100644
--- a/config/hosts/athame/mail.nix
+++ b/config/hosts/athame/mail.nix
@@ -1,10 +1,9 @@
 { config, pkgs, ... }:
-let sources = (import ../../../nix/sources.nix);
-secrets = (import ../../../secrets.nix);
+let
+  sources = (import ../../../nix/sources.nix);
+  secrets = (import ../../../secrets.nix);
 in {
-  imports = [
-    sources.nixos-mailserver.outPath
-  ];
+  imports = [ sources.nixos-mailserver.outPath ];
 
   mailserver = {
     enable = true;
@@ -14,26 +13,22 @@ in {
     # A list of all login accounts. To create the password hashes, use
     # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2
     loginAccounts = {
-        "kat@kittywit.ch" = {
-            hashedPassword = secrets.hosts.athame.mail.kat.password;
+      "kat@kittywit.ch" = {
+        hashedPassword = secrets.hosts.athame.mail.kat.password;
 
-            aliases = [
-                "postmaster@kittywit.ch"
-            ];
+        aliases = [ "postmaster@kittywit.ch" ];
 
-            # Make this user the catchAll address for domains kittywit.ch and
-            # example2.com
-            catchAll = [
-                "kittywit.ch"
-            ];
-        };
+        # Make this user the catchAll address for domains kittywit.ch and
+        # example2.com
+        catchAll = [ "kittywit.ch" ];
+      };
     };
 
     # Extra virtual aliases. These are email addresses that are forwarded to
     # loginAccounts addresses.
     extraVirtualAliases = {
-        # address = forward address;
-        "abuse@kittywit.ch" = "kat@kittywit.ch";
+      # address = forward address;
+      "abuse@kittywit.ch" = "kat@kittywit.ch";
     };
 
     # Use Let's Encrypt certificates. Note that this needs to set up a stripped
@@ -53,4 +48,4 @@ in {
     # 1 Gb RAM for the server. Without virus scanning 256 MB RAM should be plenty)
     virusScanning = false;
   };
-}
\ No newline at end of file
+}
diff --git a/config/users/kat/default.nix b/config/users/kat/default.nix
index a278a751..c48d4dc7 100644
--- a/config/users/kat/default.nix
+++ b/config/users/kat/default.nix
@@ -15,8 +15,7 @@
     uid = 1000;
     isNormalUser = true;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDX2x9eT02eJn2lAc7zA3c84+FXkft1f3hbTXKZ6+q/F kat@yule"
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCno0Ci2VEkxgWu1mR24puvphHw3KdaNelEhS7n5LEtNuFuNLd0vhQkP5sWGqg4W9pjcHELV8898Bz7+K+ikbZgD2yiK9ROFxSZc/e47H5m9Yn74blrahFmu4S1RL+UPlqnJoUwULsP28xDW3iZbBYnWffMGWXL6Yr8oAdMvOMmKf6KZ/akfRIB22kS6y1XeJnfnzQZRImr+whrNiXKrCXqlcINLkObZW0Wv+BwfXKMhD0lqlTJYAyMdmfWy7ARep032A/XE+gOcln9Ut55GcVwS45LreZuXlk66lHZvFNeK0ETa079Fl7Bx4kYhuek48bIYwpqsIPW+1CDNyeW79Fd dorkd@DESKTOP-U9VEBIL"
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454"
     ];
     shell = pkgs.fish;
     extraGroups = [ "wheel" "video" ];
@@ -47,9 +46,7 @@
       enable = true;
       userName = "kat witch";
       userEmail = "kat@kittywit.ch";
-      signing = {
-        key = "01F50A29D4AA91175A11BDB17248991EFA8EFBEE";
-      };
+      signing = { key = "01F50A29D4AA91175A11BDB17248991EFA8EFBEE"; };
     };
 
     programs.ssh = {
diff --git a/config/users/kat/desktop.nix b/config/users/kat/desktop.nix
index e0a8b355..14e21da8 100644
--- a/config/users/kat/desktop.nix
+++ b/config/users/kat/desktop.nix
@@ -15,7 +15,7 @@ in {
     services.xserver.displayManager.lightdm.enable = true;
     programs.light.enable = true;
     services.tumbler.enable = true;
-    
+
     users.users.kat = {
       packages = with pkgs; [
         _1password
@@ -56,16 +56,21 @@ in {
         neofetch
         htop
       ];
-  };
+    };
 
-      programs.gnupg.agent = {
-        enable = true;
-        enableSSHSupport = true;
-        pinentryFlavor = "gtk2";
-      };
+    programs.gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      pinentryFlavor = "gtk2";
+    };
 
     home-manager.users.kat = {
 
+      home.file.".gnupg/gpg-agent.conf".text = ''
+        enable-ssh-support
+        pinentry-program ${pkgs.pinentry.gtk2}/bin/pinentry
+      '';
+
       services.nextcloud-client.enable = true;
 
       programs.firefox = { enable = true; };
diff --git a/config/users/kat/fish.nix b/config/users/kat/fish.nix
index c8b0bf3d..97d24047 100644
--- a/config/users/kat/fish.nix
+++ b/config/users/kat/fish.nix
@@ -5,9 +5,10 @@
     programs.fish = {
       enable = true;
       interactiveShellInit = ''
-        ${if (lib.elem "desktop" config.meta.deploy.groups)
-                then "export SSH_AUTH_SOCK=(gpgconf --list-dirs agent-ssh-socket)"
-                else ""}
+        ${if (lib.elem "desktop" config.meta.deploy.groups) then
+          "export SSH_AUTH_SOCK=(gpgconf --list-dirs agent-ssh-socket)"
+        else
+          ""}
         set -g fish_greeting ""
       '';
       shellAliases = { nixdirfmt = "fd --color=never .nix | xargs nixfmt"; };
@@ -22,9 +23,9 @@
       }];
     };
   };
-    programs.direnv = {
-        enable = true;
-        enableFishIntegration = true;
-        enableNixDirenvIntegration = true;
-    };
-}
\ No newline at end of file
+  programs.direnv = {
+    enable = true;
+    enableFishIntegration = true;
+    enableNixDirenvIntegration = true;
+  };
+}