Merge branch 'master' of ssh://git.beckmeyer.us:8101/TnSb/dotfiles
This commit is contained in:
commit
9e8ac7bce4
@ -1,11 +1,14 @@
|
||||
README.md
|
||||
|
||||
{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") }}
|
||||
{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (env "ANDROID_ROOT") }}
|
||||
.config/beets
|
||||
.config/davfs2/secrets
|
||||
.config/kitty
|
||||
.config/kitty/kitty-gruvbox-theme
|
||||
.config/sway
|
||||
.config/waybar
|
||||
{{ end }}
|
||||
|
||||
{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") }}
|
||||
.local/share/gnupg/sshcontrol
|
||||
{{ end }}
|
||||
|
@ -87,8 +87,12 @@ fi
|
||||
if command -v keychain >/dev/null; then
|
||||
alias keychain="keychain --nolock --absolute --dir $XDG_RUNTIME_DIR"
|
||||
eval "$(keychain --quick --eval)"
|
||||
rbw unlock
|
||||
SSH_ASKPASS=get_id_rsa_pass SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa
|
||||
if command -v rbw >/dev/null; then
|
||||
rbw unlock
|
||||
SSH_ASKPASS=get_id_rsa_pass SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa
|
||||
else
|
||||
ssh-add ~/.ssh/id_rsa
|
||||
fi
|
||||
fi
|
||||
|
||||
# Command not found handler
|
||||
|
Loading…
Reference in New Issue
Block a user