checkpoint

3 files changed, 20 insertions, 6 deletions

diff --git a/bin/common/askpass b/bin/common/askpass
index c7d2249..ebd833c 100755
--- a/bin/common/askpass
+++ b/bin/common/askpass
@@ -12,6 +12,5 @@ key="$(printf '%s\n' "$1" |
 pass="keys/$(hostname)/ssh/$key"
 
 # optional: add key to running ssh-agent
-keyadd "$key" &
-
-pass show "$pass" | head -n 1
+keyadd "$key" &&
+    pass show "$pass" | head -n 1
diff --git a/bin/menuscripts/mpower b/bin/menuscripts/mpower
index cccba94..601e206 100755
--- a/bin/menuscripts/mpower
+++ b/bin/menuscripts/mpower
@@ -5,6 +5,7 @@ poweroff
 suspend
 reboot
 firmware
+hibernate
 EOF
 )"
 # hibernate
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 2a21655..7dd14cf 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -344,9 +344,9 @@ nvim_bindings() {  "$(tmp="$(mktemp)"; nvim +":set nomore | :redir! > $tmp | :ma
 
 prj () {
     pfx="$HOME/proj"
-	d="$(find "$pfx" -mindepth 1 -maxdepth 1 -type d | sed "s@$pfx@@" |fzf)"
-    [ -d "$d" ] || exit 1
-    cd "$pfx"/"$d"
+	d="$(find "$pfx" -mindepth 1 -maxdepth 1 -type d | sed "s@$pfx/@@" |fzf)"
+    [ -d "$pfx/$d" ] || return 1
+    cd "$pfx/$d"
 }
 
 edit_git_file () {
@@ -355,3 +355,17 @@ edit_git_file () {
     [ "$f" ] || return 2
     $EDITOR "$1"/"$f"
 }
+
+# Wrapper to automatically add the key
+# could have been alias='SSH_ASKPASS=askpass SSH_ASKPASS_REQUIRE=prefer ssh'
+# but this option is very slow for some reason
+ssh() {
+    for arg in $@; do
+        if grep "Host $arg\s*\$" ~/.ssh/config > /dev/null 2>&1 ;
+        then
+            keyadd "$arg" 2> /dev/null
+            break
+        fi
+    done
+    /usr/bin/ssh $@
+}