From 198061f3f47b4ef00b3c99c2643585851d349a22 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Wed, 10 Mar 2021 21:17:10 -0500
Subject: update xmonad

---
 common/bin/P              | 24 ------------------------
 common/bin/rofipass       | 24 ++++++++++++++++++++++++
 desktop/.xmonad/xmonad.hs |  5 +++--
 3 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100755 common/bin/P
 create mode 100755 common/bin/rofipass

diff --git a/common/bin/P b/common/bin/P
deleted file mode 100755
index 7fb5a4b..0000000
--- a/common/bin/P
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-shopt -s nullglob globstar
-
-typeit=0
-if [[ $1 == "--type" ]]; then
-	typeit=1
-	shift
-fi
-
-prefix=${PASSWORD_STORE_DIR-~/.password-store}
-password_files=( "$prefix"/**/*.gpg )
-password_files=( "${password_files[@]#"$prefix"/}" )
-password_files=( "${password_files[@]%.gpg}" )
-
-password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu "$@")
-
-[[ -n $password ]] || exit
-
-if [[ $typeit -eq 0 ]]; then
-	pass show -c "$password" 2>/dev/null
-else
-	xdotool - <<<"type --clearmodifiers -- $(pass show "$password" | head -n 1)"
-fi
diff --git a/common/bin/rofipass b/common/bin/rofipass
new file mode 100755
index 0000000..7fb5a4b
--- /dev/null
+++ b/common/bin/rofipass
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+shopt -s nullglob globstar
+
+typeit=0
+if [[ $1 == "--type" ]]; then
+	typeit=1
+	shift
+fi
+
+prefix=${PASSWORD_STORE_DIR-~/.password-store}
+password_files=( "$prefix"/**/*.gpg )
+password_files=( "${password_files[@]#"$prefix"/}" )
+password_files=( "${password_files[@]%.gpg}" )
+
+password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu "$@")
+
+[[ -n $password ]] || exit
+
+if [[ $typeit -eq 0 ]]; then
+	pass show -c "$password" 2>/dev/null
+else
+	xdotool - <<<"type --clearmodifiers -- $(pass show "$password" | head -n 1)"
+fi
diff --git a/desktop/.xmonad/xmonad.hs b/desktop/.xmonad/xmonad.hs
index e956b0f..bbcf660 100644
--- a/desktop/.xmonad/xmonad.hs
+++ b/desktop/.xmonad/xmonad.hs
@@ -90,6 +90,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
 
     -- launch dmenu
     , ((modm,               xK_d     ), spawn "rofi -show run")
+    , ((modm,               xK_s     ), spawn "rofipass --type")
 
     -- close focused window
     , ((modm .|. shiftMask, xK_c     ), kill)
@@ -146,8 +147,8 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     , ((modm              , xK_v ), spawn decreaseVolumeCommand)
     , ((modm              , xK_z ), spawn increaseVolumeCommand)
 
-    , ((modm              , xK_s ), (layoutScreens 2 (TwoPane 0.5 0.5)))
-    , ((modm .|. shiftMask, xK_s ), rescreen)
+    -- , ((modm              , xK_s ), (layoutScreens 2 (TwoPane 0.5 0.5)))
+    -- , ((modm .|. shiftMask, xK_s ), rescreen)
 
     -- This is redundant because it's added by the statusBar function.
     , ((modm              , xK_b     ), sendMessage ToggleStruts)
-- 
cgit v1.2.3