From 7f41488da63c40c6eeba2e7d35aef9db3815ac20 Mon Sep 17 00:00:00 2001 From: Uyanide Date: Mon, 13 Apr 2026 18:25:22 +0200 Subject: [PATCH] update --- config/nwg-look/.config/gtk-3.0/settings.ini | 3 +-- config/shell/.bash_profile | 12 +++++------- config/shell/.bashrc | 6 +++++- config/shell/.config/fish/conf.d/10-env.fish | 5 +++++ config/shell/.config/zsh/conf.d/10-env.zsh | 7 +++++++ config/shell/.zprofile | 6 ------ config/yazi/.config/yazi/package.toml | 4 ++-- 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index 4831780..17f5189 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -12,9 +12,8 @@ gtk-enable-input-feedback-sounds=0 gtk-font-name=Sarasa UI SC, 10 gtk-icon-theme-name=Papirus gtk-menu-images=true -gtk-modules=colorreload-gtk-module:appmenu-gtk-module +gtk-modules=colorreload-gtk-module gtk-primary-button-warps-slider=true -gtk-shell-shows-menubar=1 gtk-sound-theme-name=ocean gtk-theme-name=catppuccin-mocha-blue-standard+default gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/config/shell/.bash_profile b/config/shell/.bash_profile index 2ef6961..cb6d3ea 100644 --- a/config/shell/.bash_profile +++ b/config/shell/.bash_profile @@ -45,22 +45,20 @@ prepend_path "$HOME/.local/scripts" prepend_path "$HOME/.local/share/fnm" 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 if type gpgconf &>/dev/null && type gpg-connect-agent &>/dev/null && [ -x "$HOME/.local/scripts/gpg-init" ] && - [ "${UY_ENABLE_GPG_AGENT_SSH:-0}" = "1" ]; then + [ "${UY_ENABLE_GPG_AGENT_SSH:-0}" = "1" ]; then # GPG agent for SSH eval "$($HOME/.local/scripts/gpg-init 2>/dev/null)" &>/dev/null fi if type ssh-add &>/dev/null && type ssh-agent &>/dev/null && { [ -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 unset SSH_AUTH_SOCK # SSH with cross-session ssh-agent diff --git a/config/shell/.bashrc b/config/shell/.bashrc index ed55905..af14745 100644 --- a/config/shell/.bashrc +++ b/config/shell/.bashrc @@ -49,6 +49,10 @@ if type gpg &>/dev/null; then export GPG_TTY fi +if type fnm &>/dev/null; then + eval "$(fnm env --shell bash --use-on-cd)" +fi + if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then function sshs() { if ! ssh-add -l &>/dev/null; then @@ -63,5 +67,5 @@ if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then fi if type starship &>/dev/null; then - eval $(starship init bash) + eval "$(starship init bash)" fi diff --git a/config/shell/.config/fish/conf.d/10-env.fish b/config/shell/.config/fish/conf.d/10-env.fish index a8a24d8..2a375a5 100644 --- a/config/shell/.config/fish/conf.d/10-env.fish +++ b/config/shell/.config/fish/conf.d/10-env.fish @@ -26,3 +26,8 @@ set -x -g GPG_TTY (tty) # done set -U __done_min_cmd_duration 10000 set -U __done_notification_urgency_level low + +# fnm +if type -q fnm + fnm env --shell fish --use-on-cd | source +end diff --git a/config/shell/.config/zsh/conf.d/10-env.zsh b/config/shell/.config/zsh/conf.d/10-env.zsh index 9da3168..2640aa6 100644 --- a/config/shell/.config/zsh/conf.d/10-env.zsh +++ b/config/shell/.config/zsh/conf.d/10-env.zsh @@ -35,3 +35,10 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#6c7086" if (( $+commands[code] )) && [[ "$TERM_PROGRAM" == "vscode" ]]; then source "$(code --locate-shell-integration-path zsh)" fi + +# fnm + +if (( $+commands[fnm] )); then + eval "$(fnm env --shell zsh --use-on-cd)" +fi + diff --git a/config/shell/.zprofile b/config/shell/.zprofile index 71ee3a3..83c63f2 100644 --- a/config/shell/.zprofile +++ b/config/shell/.zprofile @@ -50,12 +50,6 @@ prepend_path "$HOME/.local/scripts" prepend_path "$HOME/.local/share/fnm" export PATH -# fnm - -if (( $+commands[fnm] )); then - eval "$(fnm env --shell zsh)" -fi - # GPG agent for SSH if (( $+commands[gpgconf] )) && (( $+commands[gpg-connect-agent] )) && diff --git a/config/yazi/.config/yazi/package.toml b/config/yazi/.config/yazi/package.toml index f6f7be8..5bc6e09 100644 --- a/config/yazi/.config/yazi/package.toml +++ b/config/yazi/.config/yazi/package.toml @@ -1,11 +1,11 @@ [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "43c6978" +rev = "babfd0f" hash = "26db011a778f261d730d4f5f8bf24b3f" [[plugin.deps]] use = "yazi-rs/plugins:smart-enter" -rev = "43c6978" +rev = "babfd0f" hash = "187cc58ba7ac3befd49c342129e6f1b6" [[plugin.deps]]