From 9ba68215f2f03a6e202ebe16349d02b4aec8112d Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 26 Jun 2022 15:22:11 +0100
Subject: more scratchpads

---
 xmonad.hs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/xmonad.hs b/xmonad.hs
index f3531bb..b531530 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -143,23 +143,22 @@ keyDefs conf =
   , ("M-C-<Left>", resize (-10,0) (0,1))
   , ("M-C-<Up>", resize (0,-10) (0,0))
   , ("M-C-<Down>", resize (0,10) (0,0))
+  , ("M-a", scratch "aptitude")
   , ("M-b", sendMessage $ MD.ToggleStruts)
-  -- , ("M-d", NS.namedScratchpadAction scratchpads "tidal")
-  -- , ("M-S-d", toggleEmacs runOrRiseMusic)
+  , ("M-S-d", scratch "tidal-hifi")
   , ("M-d", toggleEmacs $ windows (W.greedyView "D"))
   , ("M-e", toggleEmacs runOrRaiseFirefox)
   , ("M-C-e", spawn "emacsclient -c")
   , ("M-S-e", spawn (jaoscript "eterm"))
   , ("M-p", zathuraToEmacs >> raiseEmacs)
-  -- , ("M-p", NS.namedScratchpadAction scratchpads "popup")
   , ("M-m", raiseEmacs >> emacsclient "jao-transient-media")
   , ("M-r", bindFirst [(isntEmacs, runCmd),
                        (pure True, emacsclient "jao-recoll-transient")])
   , ("M-S-r", runCmd)
   , ("M-s", raiseEmacs >> emacsclient "jao-transient-streaming")
   , ("M-S-s", withFocused $ windows . W.sink)
-  , ("M-t", emacsAfio "main" >> emacsclient "vterm")
-  , ("M-S-t", spawn (jaoscript "term"))
+  , ("M-S-t", emacsAfio "main" >> emacsclient "vterm")
+  , ("M-t", spawn "kitty")
   , ("M-w", raiseEmacs >> emacsclient "jao-transient-utils")
   , ("M-x 1", emacsAfio "main")
   , ("M-x k", kill)
@@ -190,6 +189,7 @@ keyDefs conf =
           move r = withFocused $ keysMoveWindow r
           runCmd = PS.shellPrompt $ conf {P.position = P.Top}
           resize a b = withFocused $ keysResizeWindow a b
+          scratch = NS.namedScratchpadAction scratchpads
 
 layouts = PW.onWorkspace "D" lytTall lytFullTall
   where
@@ -206,8 +206,9 @@ layouts = PW.onWorkspace "D" lytTall lytFullTall
 scratchpads =
   [ NS.NS "music" openMusicWindow isMusic cf
   , NS.NS "tidal" "tidal-hifi" (className =? "tidal-hifi") cf
-  , NS.NS "popup" "firefox --class=Popup -P popup" (className =? "Popup") doFloat
-  ] where cf = (centerFloat (3/4) (7/8))
+  , NS.NS "popup" "firefox --class=Popup -P popup" (className =? "Popup") cf
+  , NS.NS "aptitude" "kitty -e aptitude" (title =? "aptitude") cf
+  ] where cf = centerFloat (3/4) (7/8)
 scratchpad = NS.namedScratchpadManageHook scratchpads
 
 centerFloat width height
-- 
cgit v1.2.3