refactor(xmonad): remove pavucontrol scratchpad

Remove the pavucontrol named scratchpad, as it wasn't being used and was just cluttering up the configuration.
d3adb5 · Nov 5, 2023 · 6297b76 · 6297b76
1 parent 75aa587
commit 6297b76
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/xmonad/src/Config/Bindings.hs b/xmonad/src/Config/Bindings.hs
@@ -32,7 +32,6 @@ keyBindings =
   , ("M-M1-k", withFocused swapWithLastHidden)
   , ("M-M1-l", withLastHidden unhideWindow)
   , ("M-[", namedScratchpadAction MH.scratchpads "term")
-  , ("M-s v", namedScratchpadAction MH.scratchpads "volume")
   , ("M-C-y", chooseWorkspace >>= windows . copy)
   , ("M-<Backspace>", kill1)
   , ("M-S-y", withFocused $ moveToWorkspace' "fzfmenu" fzfmenuArgs)

diff --git a/xmonad/src/Config/Dimensions.hs b/xmonad/src/Config/Dimensions.hs
@@ -38,3 +38,9 @@ terminalLRatio lnum = verticalSpan % availableVerticalSpan
 -- | Calculates the horizontal ratio of a window given its width in pixels.
 horizontalRatio :: Integral a => a -> Ratio a
 horizontalRatio width = width % availableHorizontalSpan
+
+decorationSpan = borderWidth + terminalPadding
+
+columnsToWindowWidth, linesToWindowHeight :: Integral a => a -> a
+columnsToWindowWidth cols = cols * characterWidth + 2 * decorationSpan
+linesToWindowHeight  lins = lins * characterHeight + 2 * decorationSpan
diff --git a/xmonad/src/Config/ManageHook.hs b/xmonad/src/Config/ManageHook.hs
@@ -5,14 +5,15 @@ import XMonad hiding (manageHook, borderWidth)
 import XMonad.Hooks.InsertPosition
 import XMonad.Hooks.ManageHelpers
 import XMonad.Util.CenterRationalRect
-import XMonad.Util.NamedScratchpad hiding (hook)
+import XMonad.Util.NamedScratchpad hiding (name, query, hook)
 import XMonad.Util.WindowProperties (getProp32s)
 import XMonad.StackSet (floating)
 
 import qualified XMonad.Actions.DynamicWorkspaces as DW
 import qualified XMonad.StackSet as W
 
 import Config.Dimensions
+import Data.List (singleton)
 import Data.Map (member)
 import Data.Maybe (isJust)
 import Data.Ratio
@@ -40,18 +41,13 @@ manageHook = composeAll
       , ("WM_WINDOW_ROLE", "file-png") ]
 
 scratchpads :: [NamedScratchpad]
-scratchpads =
-  [ NS "term" "st -n scratch -t scratch -e tmux new -A -s scratch"
-    (appName =? "scratch")
-    (customFloating $ centerIRectOffsetY panelHeight tw th sw sh)
-  , NS "volume" "pavucontrol"
-    (className =? "Pavucontrol")
-    (customFloating $ centerIRectOffsetY panelHeight vw vh sw sh)
-  ]
-  where tw = 150 * characterWidth + 2 * (borderWidth + terminalPadding)
-        th =  40 * characterHeight + 2 * (borderWidth + terminalPadding)
-        (sw,sh) = (screenWidth, screenHeight)
-        (vw,vh) = (768,648)
+scratchpads = singleton $ NS name command query hook
+  where command = "st -n scratch -t scratch -e tmux new -A -s scratch"
+        hook = customFloating $ centerIRectOffsetY panelHeight tw th sw sh
+        (tw, th) = (columnsToWindowWidth 150, linesToWindowHeight 40)
+        (sw, sh) = (screenWidth, screenHeight)
+        query = appName =? "scratch"
+        name = "term"
 
 -- | Properly center a floating window in the available screen real estate.
 centerFloat :: ManageHook