X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/385ee6486fbbabfd8c49023acfc2dfc2b08a0b83..a59aa3f7d15dae57e2d066e47af3556c46d9dac4:/zshenv

diff --git a/zshenv b/zshenv
index 7a3b049..b0fdbfe 100644
--- a/zshenv
+++ b/zshenv
@@ -6,11 +6,16 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export HOST=$(hostname)
 
 # the default command to open a new terminal
-export TERMINAL=kitty
+export TERMINAL=wezterm
 export THEME=nord
 
 # gpg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+#TODO this should probably be set for all shells?
+if [[ -z "$DISPLAY" ]]; then
+    export PINENTRY_USER_DATA="curses"
+fi
+
 # ssh
 export SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-"$XDG_RUNTIME_DIR/ssh-agent.socket"}
 
@@ -28,9 +33,9 @@ fi
 
 # vim stuff
 [[ -d "$XDG_CACHE_HOME/vim/backup" ]] || mkdir -p "$XDG_CACHE_HOME"/vim/{backup,undo,view}
-export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
-export EDITOR=vim
-export VISUAL=vim
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/"..(has("nvim")?"nvim/init.lua":"vim/vimrc") | source $MYVIMRC'
+export EDITOR=nvim
+export VISUAL=nvim
 
 # default browser
 export BROWSER=qutebrowser
@@ -68,5 +73,3 @@ export AUR_PAGER=ranger
 # cmake
 export CMAKE_EXPORT_COMPILE_COMMANDS=1
 export CTEST_OUTPUT_ON_FAILURE=1
-
-export WORKSPACE=~/src/fpp/