diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 578259b..1dc539c 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -52,29 +52,6 @@
       vterm_printf = ''
         printf "\e]%s\e\\" "$argv"
       '';
-      setup_gpg = ''
-        set -x GPG_TTY (tty)
-
-        if not test -d $HOME/.gnupg
-            mkdir -p $HOME/.gnupg
-            chmod 700 $HOME/.gnupg
-        end
-
-        set pinentry_line "pinentry-program "(which pinentry-mac)
-        if test -f $HOME/.gnupg/gpg-agent.conf
-            if not grep -Fxq $pinentry_line $HOME/.gnupg/gpg-agent.conf
-                echo $pinentry_line >> $HOME/.gnupg/gpg-agent.conf
-            end
-        else
-            echo $pinentry_line > $HOME/.gnupg/gpg-agent.conf
-        end
-
-        if pgrep gpg-agent > /dev/null
-            killall gpg-agent
-        end
-
-        echo "gpg + pinentry-mac installed and configured."
-      '';
     };
 
     interactiveShellInit = ''
@@ -83,14 +60,6 @@
 
       set -x GPG_TTY (tty)
 
-      if test "$INSIDE_EMACS" != "vterm"
-          set fish_cursor_insert      line       blink
-          set fish_cursor_replace_one underscore blink
-          set fish_cursor_visual      block
-          set fish_vi_force_cursor 1
-          fish_vi_key_bindings
-      end
-
       fish_add_path /run/current-system/sw/bin
       fish_add_path /opt/homebrew/bin