diff --git a/mod/security.nix b/mod/security.nix
index e18f08f..2c70357 100644
--- a/mod/security.nix
+++ b/mod/security.nix
@@ -1,7 +1,9 @@
-{ ... }:
+{ pkgs, ... }:
 {
+  environment.systemPackages = with pkgs; [ seahorse ];
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
+    pinentryPackage = pkgs.pinentry-gtk2;
   };
 }
diff --git a/mod/software/editors.nix b/mod/software/editors.nix
new file mode 100644
index 0000000..e550b35
--- /dev/null
+++ b/mod/software/editors.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    vscode
+    emacs
+    jetbrains.gateway
+    jetbrains.rust-rover
+  ];
+}
diff --git a/mod/software/programs.nix b/mod/software/programs.nix
index 7d33bee..e5f3d78 100644
--- a/mod/software/programs.nix
+++ b/mod/software/programs.nix
@@ -1,42 +1,20 @@
 { pkgs, ... }:
 {
-
-  environment.systemPackages =
-    let
-      editors = with pkgs; [
-        vscode
-        emacs
-        jetbrains.gateway
-        jetbrains.rust-rover
-      ];
-
-      messengers = with pkgs; [
-        signal-desktop
-        element-desktop
-        zulip
-        vesktop
-      ];
-
-      util = with pkgs; [
-        wireguard-tools
-        bitwarden
-        kitty
-        nil
-      ];
-
-      media = with pkgs; [
-        vlc
-        spotify
-        calibre
-      ];
-
-      productivity = with pkgs; [
-        zotero
-        obsidian
-      ];
-
-    in
-    editors ++ messengers ++ util ++ media ++ productivity;
+  environment.systemPackages = with pkgs; [
+    signal-desktop
+    element-desktop
+    zulip
+    vesktop
+    wireguard-tools
+    bitwarden
+    kitty
+    nil
+    vlc
+    spotify
+    calibre
+    zotero
+    obsidian
+  ];
 
   virtualisation = {
     docker.enable = true;
@@ -44,9 +22,17 @@
 
   programs = {
     firefox.enable = true;
-    thunderbird = {
+  };
+
+  home = {
+    programs.thunderbird = {
       enable = true;
       package = pkgs.thunderbird-latest;
+      profiles.default.isDefault = true;
+      profiles.default.settings = {
+        "mail.openpgp.allow_external_gnupg" = true;
+        "mail.openpgp.fetch_pubkeys_from_gnupg" = true;
+      };
     };
   };