diff --git a/fish/.config/omf/init.fish b/fish/.config/omf/init.fish
index 8a42ed6..7b7139e 100644
--- a/fish/.config/omf/init.fish
+++ b/fish/.config/omf/init.fish
@@ -59,10 +59,10 @@ set -x VISUAL "nvim"
 set -x EDITOR "nvim"
 
 # Enable password store extensions
-set -x PASSWORD_STORE_ENABLE_EXTENSIONS "true"
+set -g PASSWORD_STORE_ENABLE_EXTENSIONS "true"
 
 # Make sure pass uses the proper directory
-set -x PASSWORD_STORE_DIR ~/.local/share/pass
+set -g PASSWORD_STORE_DIR ~/.local/share/pass
 
 # Use alternative muhome
 set -x MU_HOME ~/.cache/mu
diff --git a/neomutt/.config/msmtp/config b/neomutt/.config/msmtp/config
deleted file mode 100644
index 077d25b..0000000
--- a/neomutt/.config/msmtp/config
+++ /dev/null
@@ -1,26 +0,0 @@
-defaults
-auth	on
-tls	on
-tls_trust_file	/etc/ssl/certs/ca-certificates.crt
-logfile	~/.config/msmtp/msmtp.log
-
-account ryankes
-host smtp.mailbox.org
-port 587
-from ryan@ryankes.eu
-user ryan@ryankes.eu
-passwordeval "getpassword ryankes"
-
-account gmail
-host smtp.gmail.com
-port 587
-from alrayyes@gmail.com
-user alrayyes@gmail.com
-passwordeval "getpassword gmail"
-
-account andthensome
-host smtp.gmail.com
-port 587
-from ryan@andthensome.nl
-user ryan@andthensome.nl
-passwordeval "getpassword andthensome"