From ded4f2340341ccb4320901a7e3bdd30bed3d94e3 Mon Sep 17 00:00:00 2001
From: Jeff LANCE <email@jefflance.me>
Date: Wed, 9 Apr 2025 16:14:34 +0200
Subject: [PATCH] Update home/.zshenv Update home/.zshrc

---
 home/dot_zshenv |  3 ++-
 home/dot_zshrc  | 28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/home/dot_zshenv b/home/dot_zshenv
index a3ca256..67d0798 100644
--- a/home/dot_zshenv
+++ b/home/dot_zshenv
@@ -25,7 +25,8 @@ export PATH="$PATH:$(go env GOBIN):$(go env GOPATH)/bin"
 
 export BROWSER=qutebrowser
 export EDITOR=$([[ $(command -v lvim) ]] && echo lvim || echo vim)
-export TERMINAL=alacritty
+export TERMINAL=kitty
+[[ ( $(command -v code) && $(command -v trash) ) ]] && export ELECTRON_TRASH="trash"
 # export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
 
 export PASSWORD_STORE_DIR="${HOME}/.password-store"
diff --git a/home/dot_zshrc b/home/dot_zshrc
index f871220..cf59f47 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -30,6 +30,8 @@ SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
 # Remove path separator from WORDCHARS.
 WORDCHARS=${WORDCHARS//[\/]}
 
+# Zoxide configuration
+ZOXIDE_CMD_OVERRIDE=cd
 
 # --------------------
 # Module configuration
@@ -127,14 +129,18 @@ bindkey -M vicmd 'j' history-substring-search-down
 #
 # zoxide
 #
-eval "$(zoxide init --cmd cd zsh)"
+if (( $+commands[zoxide] )); then
+  eval "$(zoxide init --cmd ${ZOXIDE_CMD_OVERRIDE:-z} zsh)"
+else
+  echo '[zshrc] zoxide not found, please install it from https://github.com/ajeetdsouza/zoxide'
+fi
 
 
 
-#
-# starship
-#
-eval "$(asdf exec starship init zsh)"
+# #
+# # starship
+# #
+# eval "$(asdf exec starship init zsh)"
 
 
 
@@ -196,8 +202,9 @@ fi
 #
 # ocaml
 #
+# [[ ! -r '/home/jeff/.opam/opam-init/init.zsh' ]] || source '/home/jeff/.opam/opam-init/init.zsh' > /dev/null 2> /dev/null
 # test -r /home/jeff/.opam/opam-init/init.zsh && . /home/jeff/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
-eval "$(asdf exec opam env)"
+# eval "$(asdf exec opam env)"
 
 
 #
@@ -219,12 +226,11 @@ unset __conda_setup
 
 
 #
-# gnome-keyring-daemon
+# gpg-agent
 #
-if [[ $(command -v gnome-keyring-daemon) ]]; then
-  eval $(gnome-keyring-daemon --start) 2>/dev/null
-  export SSH_AUTH_SOCK
-fi
+export GPG_TTY="$(tty)"
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+gpgconf --launch gpg-agent