summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyren223 <contact@kyren.codes>2026-09-29 23:29:53 +0300
committerKyren223 <contact@kyren.codes>2026-09-29 23:29:53 +0300
commit69d323379d99e7bb3260581db067d62f6815baf3 (patch)
treead05966dbe31d34a0af2b3c95f99df9b575e63a6
parent730a2736165d10dc66507d2aad1e34b937c08c09 (diff)
Removed keychain from configs
-rw-r--r--.zshrc11
-rwxr-xr-xscripts/git-auto-sync.sh2
2 files changed, 11 insertions, 2 deletions
diff --git a/.zshrc b/.zshrc
index f107c30..d2a1d10 100644
--- a/.zshrc
+++ b/.zshrc
@@ -130,7 +130,16 @@ export PATH="$PATH:$HOME/.cargo/bin"
# Start ssh-agent if not running
# export SSH_ASKPASS_REQUIRE="prefer"
-eval $(keychain --quiet --quick --lockwait 60 --eval ~/.ssh/id_ed25519)
+#eval $(keychain --quiet --quick --clear --lockwait 60 --eval ~/.ssh/id_ed25519)
+# if [ -t 0 ] && ! ssh-add -l 2>/dev/null | grep -q -E "ed25519|id_ed25519"; then
+# ssh-add ~/.ssh/id_ed25519
+# fi
+if [[ -t 0 ]]; then
+ ssh-add -l >/dev/null 2>&1
+ if [[ $? -eq 1 ]]; then
+ ssh-add ~/.ssh/id_ed25519
+ fi
+fi
MARKER_FILE="/run/user/$(id -u)/autorun_once_marker"
if [ ! -f "$MARKER_FILE" ]; then
diff --git a/scripts/git-auto-sync.sh b/scripts/git-auto-sync.sh
index 8ef1871..0b4aa0b 100755
--- a/scripts/git-auto-sync.sh
+++ b/scripts/git-auto-sync.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Make sure my ssh key is loaded in ssh-agent for use when committing
-eval $(keychain --quiet --eval $HOME/.ssh/id_ed25519)
+#eval $(keychain --quiet --eval $HOME/.ssh/id_ed25519)
REPOS=(
"$HOME/personal/grimoire/"