Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ssh-agent setup for 1Password in zshrc #293

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Update ssh-agent setup for 1Password in zshrc #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions zsh/.zshrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,10 @@ onepassword-agent-check() {
}

load-our-ssh-keys() {
onepassword-agent-check
# setup ssh-agent for 1password only if it's installed
if can_haz op; then
onepassword-agent-check
fi
Comment on lines +352 to +355
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An if check here, makes sense too. 👍

# If keychain is installed let it take care of ssh-agent, else do it manually
if can_haz keychain; then
eval `keychain -q --eval`
Expand Down Expand Up @@ -968,4 +971,4 @@ function zqs() {

if [[ -f ~/.zqs-zprof-enabled ]]; then
zprof
fi
fi
Loading