From 3f39d3e334c6e67dbf565c372b1d940df291e496 Mon Sep 17 00:00:00 2001
From: Ray Andrew <rs@rs.ht>
Date: Thu, 18 Dec 2025 13:26:12 -0600
Subject: [PATCH] fix: s/mime verification failed in gpg using neomutt

---
 config/ghostty/config            |  3 ++-
 config/home/.gnupg/gpgsm.conf    |  4 ++++
 config/home/.gnupg/trustlist.txt |  2 ++
 config/neomutt/neomuttrc         |  3 +++
 config/nvim/init.lua             |  5 +++++
 config/spotify-player/app.toml   |  1 +
 home/default.nix                 | 11 +----------
 home/gpg.nix                     | 21 +++++++++++++++++++++
 hosts/dango/default.nix          |  1 +
 9 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 config/home/.gnupg/gpgsm.conf
 create mode 100644 config/home/.gnupg/trustlist.txt
 create mode 100644 home/gpg.nix

diff --git a/config/ghostty/config b/config/ghostty/config
index 29c12b3..5545089 100644
--- a/config/ghostty/config
+++ b/config/ghostty/config
@@ -55,6 +55,7 @@ theme               = noctis-azureus
 # palette = 15=#b5bfe2
 
 keybind = all:ctrl+shift+period=text:\x1b\x1f\x4c\x23\x1f
-keybind = shift+enter=text:\n
+# keybind = shift+enter=text:\n
+keybind = shift+enter=text:\x1b\r
 keybind = ctrl+left_bracket=text:\x1b
 # keybind = ctrl+a=text:\x01
diff --git a/config/home/.gnupg/gpgsm.conf b/config/home/.gnupg/gpgsm.conf
new file mode 100644
index 0000000..1a56248
--- /dev/null
+++ b/config/home/.gnupg/gpgsm.conf
@@ -0,0 +1,4 @@
+# Disable CRL checking to prevent hangs
+disable-crl-checks
+# Also disable OCSP
+disable-ocsp
diff --git a/config/home/.gnupg/trustlist.txt b/config/home/.gnupg/trustlist.txt
new file mode 100644
index 0000000..afe1d2f
--- /dev/null
+++ b/config/home/.gnupg/trustlist.txt
@@ -0,0 +1,2 @@
+# HARICA Client RSA Root CA 2021
+46:C6:90:0A:77:3A:B6:BC:F4:65:AD:AC:FC:E3:F7:07:00:6E:DE:6E S relax
diff --git a/config/neomutt/neomuttrc b/config/neomutt/neomuttrc
index 801ad04..8d7e983 100644
--- a/config/neomutt/neomuttrc
+++ b/config/neomutt/neomuttrc
@@ -16,7 +16,10 @@ set attach_save_dir = "~/"
 # General settings
 set color_directcolor = yes
 set implicit_autoview = yes
+# S/MIME and crypto settings
 set crypt_use_gpgme = yes
+set crypt_auto_smime = no
+set smime_is_default = no
 set wait_key = no
 unset mark_old
 alternative_order text/enriched text/plain text
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 120f003..009a5c7 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -261,6 +261,11 @@ later(function()
       ['<C-n>'] = 'j',
       -- Preview with Ctrl+Space
       ['<C-Space>'] = 'actions.preview',
+      -- Tmux navigation
+      ['<C-h>'] = function() require('tmux').move_left() end,
+      ['<C-j>'] = function() require('tmux').move_bottom() end,
+      ['<C-k>'] = function() require('tmux').move_top() end,
+      ['<C-l>'] = function() require('tmux').move_right() end,
       -- Copy current directory path to clipboard
       ['gy'] = {
         callback = function()
diff --git a/config/spotify-player/app.toml b/config/spotify-player/app.toml
index a2a1d40..6650201 100644
--- a/config/spotify-player/app.toml
+++ b/config/spotify-player/app.toml
@@ -1,4 +1,5 @@
 theme = "noctis_azureus"
+client_id = "9fe4fbbcf6204173a91b03be52848142"
 client_port = 8080
 login_redirect_uri = "http://127.0.0.1:8989/login"
 playback_format = """
diff --git a/home/default.nix b/home/default.nix
index 2a98b43..a274a98 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,6 +9,7 @@
     ./email
     ./emacs.nix
     ./git.nix
+    ./gpg.nix
     ./gui.nix
     ./latex.nix
     ./neovim.nix
@@ -18,13 +19,6 @@
   ];
 
   config = {
-    services = {
-      gpg-agent = {
-        enable = true;
-        # enableSshSupport = true;
-      };
-    };
-
     fonts.fontconfig.enable = true;
 
     programs = {
@@ -42,9 +36,6 @@
         enableZshIntegration = config.programs.zsh.enable;
         nix-direnv.enable = true;
       };
-      gpg = {
-        enable = true;
-      };
       bat = {
         enable = true;
         extraPackages = [
diff --git a/home/gpg.nix b/home/gpg.nix
new file mode 100644
index 0000000..e297eb0
--- /dev/null
+++ b/home/gpg.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  dots,
+  ...
+}:
+{
+  services.gpg-agent = {
+    enable = true;
+    # enableSshSupport = true;
+  };
+
+  programs.gpg.enable = true;
+
+  # gpgsm config for S/MIME
+  home.file = {
+    ".gnupg/gpgsm.conf".source =
+      config.lib.file.mkOutOfStoreSymlink "${dots}/config/home/.gnupg/gpgsm.conf";
+    ".gnupg/trustlist.txt".source =
+      config.lib.file.mkOutOfStoreSymlink "${dots}/config/home/.gnupg/trustlist.txt";
+  };
+}
diff --git a/hosts/dango/default.nix b/hosts/dango/default.nix
index 92948f8..625bd5c 100644
--- a/hosts/dango/default.nix
+++ b/hosts/dango/default.nix
@@ -78,6 +78,7 @@
     wget
     igv
     claude-code
+    codex
     nodejs_24
     ghidra-bin
   ];