Compare commits
2 Commits
07d9d6364e
...
bc3ab33c0a
| Author | SHA1 | Date | |
|---|---|---|---|
| bc3ab33c0a | |||
| c0c25c44b8 |
@@ -24,7 +24,7 @@ export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||
|
||||
# ---- SSH agent socket ----
|
||||
# Match the socket used by ssh-agent.socket (OpenSSH), not GCR/gnome-keyring.
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.sock"
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
|
||||
|
||||
# ---- Oh My Zsh ----
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
@@ -73,7 +73,7 @@ if [ -z "${BW_SESSION:-}" ] && [ -f "$HOME/.config/Bitwarden CLI/.session" ]; th
|
||||
fi
|
||||
if [ -n "${BW_SESSION:-}" ]; then
|
||||
eval "$(bw get item Environment 2>/dev/null | jq -r '
|
||||
.fields[] | select(.type != 0) |
|
||||
.fields[] | select(.type == 0) |
|
||||
"export " + (.name | gsub(" "; "_")) + "=" + (.value | @sh)
|
||||
' 2>/dev/null)" 2>/dev/null
|
||||
fi
|
||||
|
||||
@@ -8,7 +8,7 @@ Wants=ssh-agent.service
|
||||
[Service]
|
||||
Type=oneshot
|
||||
Environment=PATH=%h/.local/bin:/usr/local/bin:/usr/bin:/bin
|
||||
Environment=SSH_AUTH_SOCK=%t/ssh-agent.sock
|
||||
Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
|
||||
ExecStart=%h/.local/bin/bw-load-ssh.sh
|
||||
RemainAfterExit=yes
|
||||
Restart=on-failure
|
||||
|
||||
Reference in New Issue
Block a user