Allow disabling loading SSH keys

This commit is contained in:
2025-12-15 15:36:05 -08:00
parent 4bc636f494
commit 54fee7544b
4 changed files with 25 additions and 22 deletions
+5 -5
View File
@@ -1,23 +1,23 @@
[Settings] [Settings]
gtk-application-prefer-dark-theme=true gtk-application-prefer-dark-theme=true
gtk-button-images=1 gtk-button-images=true
gtk-cursor-blink=true gtk-cursor-blink=true
gtk-cursor-blink-time=1000 gtk-cursor-blink-time=1000
gtk-cursor-theme-name=Qogir-dark gtk-cursor-theme-name=breeze_cursors
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
gtk-decoration-layout=icon:minimize,maximize,close gtk-decoration-layout=icon:minimize,maximize,close
gtk-enable-animations=true gtk-enable-animations=true
gtk-enable-event-sounds=0 gtk-enable-event-sounds=0
gtk-enable-input-feedback-sounds=0 gtk-enable-input-feedback-sounds=0
gtk-font-name=Noto Sans, 10 gtk-font-name=Noto Sans, 10
gtk-icon-theme-name=Gruvbox_Dark gtk-icon-theme-name=breeze-dark
gtk-menu-images=1 gtk-menu-images=true
gtk-modules=colorreload-gtk-module gtk-modules=colorreload-gtk-module
gtk-primary-button-warps-slider=true gtk-primary-button-warps-slider=true
gtk-sound-theme-name=ocean gtk-sound-theme-name=ocean
gtk-theme-name=Gruvbox-Dark-BL gtk-theme-name=Gruvbox-Dark-BL
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-style=3
gtk-xft-antialias=1 gtk-xft-antialias=1
gtk-xft-dpi=122880 gtk-xft-dpi=122880
gtk-xft-hinting=1 gtk-xft-hinting=1
+1
View File
@@ -1,3 +1,4 @@
NO_NEOFETCH=1 NO_NEOFETCH=1
NO_GIT_CHECK=1 NO_GIT_CHECK=1
NO_ZSH_COWSAY=1 NO_ZSH_COWSAY=1
LOAD_SSH_KEYS=0
+18 -16
View File
@@ -96,22 +96,24 @@ export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH" export PATH="$PYENV_ROOT/bin:$PATH"
# Make sure ssh-agent is available # Make sure ssh-agent is available
if program_installed ssh-add && [ ! -z "$SSH_AUTH_SOCK" ] && [ -d "$SSH_AUTH_SOCK" ] > /dev/null 2&>1 ; then if [ -n "$LOAD_SSH_KEYS" ] && [ "$LOAD_SSH_KEYS" -eq 1 ]; then
# Add SSH keys to agent if not already added if program_installed ssh-add && [ ! -z "$SSH_AUTH_SOCK" ] && [ -d "$SSH_AUTH_SOCK" ] > /dev/null 2&>1 ; then
## Find existing keys, supporting one layer of folder organization # Add SSH keys to agent if not already added
public_keys=($(find "$HOME/.ssh/" -maxdepth 2 -name "*.pub")) ## Find existing keys, supporting one layer of folder organization
if [ ${#public_keys[@]} -gt 0 ]; then public_keys=($(find "$HOME/.ssh/" -maxdepth 2 -name "*.pub"))
for public_key in "${public_keys[@]}"; do if [ ${#public_keys[@]} -gt 0 ]; then
if [[ $(uname -s) == Linux* ]]; then for public_key in "${public_keys[@]}"; do
# Add SSH keys only if not already present if [[ $(uname -s) == Linux* ]]; then
ssh-add -l | grep -q `ssh-keygen -lf "$public_key" | awk '{print $2}'` || ssh-add -k # Add SSH keys only if not already present
break ssh-add -l | grep -q `ssh-keygen -lf "$public_key" | awk '{print $2}'` || ssh-add -k
elif [[ $(uname -s) == Darwin* ]]; then break
# Add SSH keys only if not already present elif [[ $(uname -s) == Darwin* ]]; then
ssh-add -l | grep -q `ssh-keygen -lf "$public_key" | awk '{print $2}'` || ssh-add --apple-use-keychain # Add SSH keys only if not already present
break ssh-add -l | grep -q `ssh-keygen -lf "$public_key" | awk '{print $2}'` || ssh-add --apple-use-keychain
fi break
done fi
done
fi
fi fi
fi fi
+1 -1
View File
@@ -212,7 +212,7 @@ if program_installed pyenv; then
fi fi
# oh-my-zsh plugins (must come after all initialization above) # oh-my-zsh plugins (must come after all initialization above)
plugins=(archlinux colored-man-pages colorize command-not-found cp docker docker-compose fzf git history history-substring-search nmap npm pip poetry pyenv macos rsync snap ssh ssh-agent sudo systemd terraform thefuck tmux tmuxinator vi-mode virtualenv yarn zsh-interactive-cd zsh-navigation-tools) plugins=(archlinux colored-man-pages colorize command-not-found cp docker docker-compose fzf git history history-substring-search nmap npm pip poetry pyenv macos rsync snap ssh sudo systemd terraform thefuck tmux tmuxinator vi-mode virtualenv yarn zsh-interactive-cd zsh-navigation-tools)
# Local overrides # Local overrides
if [ -f $HOME/.zshrc_local ]; then if [ -f $HOME/.zshrc_local ]; then