This commit is contained in:
2026-04-13 18:25:22 +02:00
parent 561be8b27a
commit 7f41488da6
7 changed files with 25 additions and 18 deletions
+1 -2
View File
@@ -12,9 +12,8 @@ gtk-enable-input-feedback-sounds=0
gtk-font-name=Sarasa UI SC, 10 gtk-font-name=Sarasa UI SC, 10
gtk-icon-theme-name=Papirus gtk-icon-theme-name=Papirus
gtk-menu-images=true gtk-menu-images=true
gtk-modules=colorreload-gtk-module:appmenu-gtk-module gtk-modules=colorreload-gtk-module
gtk-primary-button-warps-slider=true gtk-primary-button-warps-slider=true
gtk-shell-shows-menubar=1
gtk-sound-theme-name=ocean gtk-sound-theme-name=ocean
gtk-theme-name=catppuccin-mocha-blue-standard+default gtk-theme-name=catppuccin-mocha-blue-standard+default
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+4 -6
View File
@@ -45,11 +45,6 @@ prepend_path "$HOME/.local/scripts"
prepend_path "$HOME/.local/share/fnm" prepend_path "$HOME/.local/share/fnm"
export PATH export PATH
# fnm
if type fnm &>/dev/null; then
eval "$(fnm env --shell bash)"
fi
# export UY_ENABLE_GPG_AGENT_SSH=1 in .profile to enable GPG agent for SSH # export UY_ENABLE_GPG_AGENT_SSH=1 in .profile to enable GPG agent for SSH
if type gpgconf &>/dev/null && type gpg-connect-agent &>/dev/null && if type gpgconf &>/dev/null && type gpg-connect-agent &>/dev/null &&
[ -x "$HOME/.local/scripts/gpg-init" ] && [ -x "$HOME/.local/scripts/gpg-init" ] &&
@@ -60,7 +55,10 @@ fi
if type ssh-add &>/dev/null && type ssh-agent &>/dev/null && if type ssh-add &>/dev/null && type ssh-agent &>/dev/null &&
{ [ -z "$SSH_AUTH_SOCK" ] || { [ -z "$SSH_AUTH_SOCK" ] ||
[ "$(ssh-add -l &>/dev/null; echo $?)" -eq 2 ]; } && [ "$(
ssh-add -l &>/dev/null
echo $?
)" -eq 2 ]; } &&
[ -x "$HOME/.local/scripts/ssh-init" ]; then [ -x "$HOME/.local/scripts/ssh-init" ]; then
unset SSH_AUTH_SOCK unset SSH_AUTH_SOCK
# SSH with cross-session ssh-agent # SSH with cross-session ssh-agent
+5 -1
View File
@@ -49,6 +49,10 @@ if type gpg &>/dev/null; then
export GPG_TTY export GPG_TTY
fi fi
if type fnm &>/dev/null; then
eval "$(fnm env --shell bash --use-on-cd)"
fi
if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then
function sshs() { function sshs() {
if ! ssh-add -l &>/dev/null; then if ! ssh-add -l &>/dev/null; then
@@ -63,5 +67,5 @@ if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then
fi fi
if type starship &>/dev/null; then if type starship &>/dev/null; then
eval $(starship init bash) eval "$(starship init bash)"
fi fi
@@ -26,3 +26,8 @@ set -x -g GPG_TTY (tty)
# done # done
set -U __done_min_cmd_duration 10000 set -U __done_min_cmd_duration 10000
set -U __done_notification_urgency_level low set -U __done_notification_urgency_level low
# fnm
if type -q fnm
fnm env --shell fish --use-on-cd | source
end
@@ -35,3 +35,10 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#6c7086"
if (( $+commands[code] )) && [[ "$TERM_PROGRAM" == "vscode" ]]; then if (( $+commands[code] )) && [[ "$TERM_PROGRAM" == "vscode" ]]; then
source "$(code --locate-shell-integration-path zsh)" source "$(code --locate-shell-integration-path zsh)"
fi fi
# fnm
if (( $+commands[fnm] )); then
eval "$(fnm env --shell zsh --use-on-cd)"
fi
-6
View File
@@ -50,12 +50,6 @@ prepend_path "$HOME/.local/scripts"
prepend_path "$HOME/.local/share/fnm" prepend_path "$HOME/.local/share/fnm"
export PATH export PATH
# fnm
if (( $+commands[fnm] )); then
eval "$(fnm env --shell zsh)"
fi
# GPG agent for SSH # GPG agent for SSH
if (( $+commands[gpgconf] )) && (( $+commands[gpg-connect-agent] )) && if (( $+commands[gpgconf] )) && (( $+commands[gpg-connect-agent] )) &&
+2 -2
View File
@@ -1,11 +1,11 @@
[[plugin.deps]] [[plugin.deps]]
use = "yazi-rs/plugins:git" use = "yazi-rs/plugins:git"
rev = "43c6978" rev = "babfd0f"
hash = "26db011a778f261d730d4f5f8bf24b3f" hash = "26db011a778f261d730d4f5f8bf24b3f"
[[plugin.deps]] [[plugin.deps]]
use = "yazi-rs/plugins:smart-enter" use = "yazi-rs/plugins:smart-enter"
rev = "43c6978" rev = "babfd0f"
hash = "187cc58ba7ac3befd49c342129e6f1b6" hash = "187cc58ba7ac3befd49c342129e6f1b6"
[[plugin.deps]] [[plugin.deps]]