From e0db34ff74766f0f306b55782a2163f7f387e747 Mon Sep 17 00:00:00 2001
From: twells46 <173561638+twells46@users.noreply.github.com>
Date: Wed, 31 Dec 2025 17:35:47 -0600
Subject: Update gopass commands

---
 dot_config/sway/config                      | 5 +++++
 private_dot_local/bin/executable_gopassmenu | 2 +-
 private_dot_local/bin/executable_gousermenu | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dot_config/sway/config b/dot_config/sway/config
index 5fc079b..8129467 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -155,6 +155,11 @@ bindsym $mod+Shift+z exec firefox --private-window
 
 bindsym $mod+Shift+backslash exec foot ncmpcpp
 
+bindsym $mod+p exec gopassmenu -t
+bindsym $mod+Shift+p exec gopassmenu
+bindsym $mod+o exec gousermenu -t
+bindsym $mod+Shift+o exec gousermenu
+
 # Lock
 bindsym $mod+grave exec pkill -USR1 swayidle
 bindsym $mod+Shift+grave exec pkill -USR2 waybar
diff --git a/private_dot_local/bin/executable_gopassmenu b/private_dot_local/bin/executable_gopassmenu
index 1fa4f5f..f557307 100644
--- a/private_dot_local/bin/executable_gopassmenu
+++ b/private_dot_local/bin/executable_gopassmenu
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PW="$(gopass ls --flat | wmenu -l 10 -p 'Password: ' -f 'Liberation Mono 12px' | xargs -r gopass show -o)"
+PW="$(gopass ls --flat | wmenu -l 10 -p 'Password: ' -f 'Liberation Mono 12px' | xargs -r gopass show | head -n1)"
 # [t]ype or copy
 if [ "$1" = "-t" ] ; then
 	wtype "${PW}"
diff --git a/private_dot_local/bin/executable_gousermenu b/private_dot_local/bin/executable_gousermenu
index 34bbcf9..cffac84 100644
--- a/private_dot_local/bin/executable_gousermenu
+++ b/private_dot_local/bin/executable_gousermenu
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-uname="$(gopass ls --flat | wmenu -l 10 -p 'Username: ' -f 'Liberation Mono 12px')"
+uname="$(gopass ls --flat | wmenu -l 10 -p 'Username: ' -f 'Liberation Mono 12px' | xargs -r gopass show | sed -n '2p')"
 # [t]ype or copy
 if [ "$1" = "-t" ] ; then
-	wtype "${uname##*/}"
+	wtype "${uname}"
 else
-	wl-copy "${uname##*/}"
+	wl-copy "${uname}"
 	( sleep 30 && wl-copy -c ) &
 fi
 #wl-copy "${uname##*/}"
-- 
cgit v1.2.3