From 3858e5943f9b915f8169a6c6e71e2cdc14f24da7 Mon Sep 17 00:00:00 2001
From: Daniel Fichtinger <daniel@ficd.ca>
Date: Mon, 5 May 2025 14:27:08 -0400
Subject: [PATCH] AutoYADM commit: 2025-05-05 14:27:08

---
 .config/fish/conf.d/bin/git-forgit |  2 +-
 .config/niri/scripts/rbw-fish.fish |  8 ++++++++
 .config/rbw/config.json            | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.config/fish/conf.d/bin/git-forgit b/.config/fish/conf.d/bin/git-forgit
index 27a893d1..8c3a61db 100755
--- a/.config/fish/conf.d/bin/git-forgit
+++ b/.config/fish/conf.d/bin/git-forgit
@@ -414,7 +414,7 @@ _forgit_show() {
         --bind=\"alt-t:transform:[[ ! \\\"\$FZF_PREVIEW_LABEL\\\" =~ 'Diff' ]] &&
                 echo 'change-preview-label( Diff )+refresh-preview' ||
                 echo 'change-preview-label( Commit Message )+refresh-preview'\"
-        $FORGIT_DIFF_FZF_OPTS
+        $FORGIT_SHOW_FZF_OPTS
         --prompt=\"${commit} > \"
     "
     _forgit_show_git_opts=()
diff --git a/.config/niri/scripts/rbw-fish.fish b/.config/niri/scripts/rbw-fish.fish
index b3d5b19f..e5bf76af 100755
--- a/.config/niri/scripts/rbw-fish.fish
+++ b/.config/niri/scripts/rbw-fish.fish
@@ -4,6 +4,14 @@
 # using rbw and fuzzel. You can copy, auto-type, or show in notification.
 # Requires wl-copy, wtype, jq, and rbw.
 
+# unlock vault if needed
+# Note: launches foot with 'footfloat' app-id
+# so Niri sets it as floating with the appropriate
+# window rule
+if not rbw unlocked
+    rbw unlock
+end
+
 set -l action
 if test (count $argv) -ne 0
     set action $argv[1]
diff --git a/.config/rbw/config.json b/.config/rbw/config.json
index ddf8ff21..034b515e 100644
--- a/.config/rbw/config.json
+++ b/.config/rbw/config.json
@@ -1 +1,12 @@
-{"email":"daniel@ficd.ca","sso_id":null,"base_url":null,"identity_url":null,"ui_url":null,"notifications_url":null,"lock_timeout":3600,"sync_interval":3600,"pinentry":"pinentry-curses","client_cert_path":null}
\ No newline at end of file
+{
+  "email": "daniel@ficd.ca",
+  "sso_id": null,
+  "base_url": null,
+  "identity_url": null,
+  "ui_url": null,
+  "notifications_url": null,
+  "lock_timeout": 3600,
+  "sync_interval": 3600,
+  "pinentry": "pinentry",
+  "client_cert_path": null
+}
\ No newline at end of file