Add passmenu integrations.

3 files changed, 6 insertions, 4 deletions

diff --git a/src/Internal/DMenu.hs b/src/Internal/DMenu.hs
index 1ece347..c5cac49 100644
--- a/src/Internal/DMenu.hs
+++ b/src/Internal/DMenu.hs
@@ -5,6 +5,6 @@ import XMonad.Util.Run
 import Control.Monad
 
 runDMenu :: X ()
-runDMenu = void $ do
+runDMenu = void $
   safeSpawn "/usr/bin/dmenu_run" [
     "-p", "Execute ", "-l", "12", "-dim", "0.4"]
diff --git a/src/Internal/Keys.hs b/src/Internal/Keys.hs
index ead1394..c385539 100644
--- a/src/Internal/Keys.hs
+++ b/src/Internal/Keys.hs
@@ -31,6 +31,7 @@ import qualified XMonad.StackSet as W
 
 import Internal.Lib
 import Internal.DMenu
+import Internal.PassMenu
 
 type KeyMap l = XConfig l -> Map (KeyMask, KeySym) (X ())
 
@@ -72,12 +73,13 @@ newKeys markContext =
         , ((modm, xK_semicolon), scratchpadSpawnActionTerminal "scratchpad")
         , ((modm, xK_F10), (void $ spawn "spotify-control play"))
         , ((modm, xK_r),   runDMenu)
+        , ((modm, xK_c),   runPassMenu)
         , ((modm .|. shiftMask, xK_r),   (void $ spawn "gmrun"))
         , ((modm .|. mod1Mask, xK_l), (void $ spawn "xsecurelock"))
-        , ((modm .|. mod1Mask, xK_s), (void $ spawn "sudo systemctl suspend"))
+        , ((modm .|. mod1Mask, xK_s), (void $ spawn "sudo systemctl suspend && xsecurelock"))
         , ((modm .|. shiftMask, xK_c), kill)
         , ((modm .|. shiftMask, xK_t), withFocused $ windows . W.sink)
-        , ((mod4Mask, xK_Escape),  (void $ spawn (terminal config)))
+        , ((mod4Mask, xK_Escape),  (void $ spawn "xterm"))
         , ((mod3Mask, xK_t),  (void $ spawn (terminal config)))
         , ((modm, xK_m), (submap $ mapAlpha modm (markCurrentWindow markContext)))
         , ((modm, xK_w), runXPlus markContext config windowJump)
diff --git a/src/Main.hs b/src/Main.hs
index eab10dc..25c930e 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -71,4 +71,4 @@ main = do
                        in icons ++ etc
                }
       toggleStructsKey
-      config { modMask = mod3Mask }
+      config