Updated keybindings for screen gaps

2 files changed, 76 insertions, 73 deletions

diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs
index 34806e8..09b6c4b 100644
--- a/.config/XMonad/lib/Defaults.hs
+++ b/.config/XMonad/lib/Defaults.hs
@@ -52,7 +52,7 @@ myTextEditor      = "emacs"
 myTextEditor'     = "nvim"
 
 -- workspaces
-myExtraWorkspaces = [(xK_0, "十")] -- , (xK_comma, "  十一  "), (xK_period, "  十二  "), (xK_slash, "  十三  ")]
+myExtraWorkspaces = [(xK_0, "十")]
 myWorkspaces      = ["一", "二", "三", "四", "五", "六", "七", "八", "九"] ++ map snd myExtraWorkspaces
 
 -- screen gaps
@@ -60,7 +60,6 @@ sGap = 4
 wGap = 6
 
 myGap  = spacingRaw True  (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True
-myGap' = spacingRaw False (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True
 
 myTabTheme = def {
     fontName              = myFont
@@ -83,15 +82,12 @@ myGSColorizer = colorRangeFromClassName
   (0xff,0xff,0xff) -- active fg
 
 myGSConfig colorizer = (buildDefaultGSConfig myGSColorizer)
-    { gs_cellheight   = 36
-    , gs_cellwidth    = 180
-    , gs_cellpadding  = 6
-    , gs_originFractX = 0.5
-    , gs_originFractY = 0.5
-    , gs_font         = myFont
-    }
+  { gs_cellheight   = 36
+  , gs_cellwidth    = 180
+  , gs_cellpadding  = 6
+  , gs_originFractX = 0.5
+  , gs_originFractY = 0.5
+  , gs_font         = myFont
+  }
 
 myGridSelect = myGSConfig myGSColorizer
-
--- myBorder          = "#120F23"
--- myBorder'         = "#C44CF2"
diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs
index 15b8e2f..84ebb7c 100644
--- a/.config/XMonad/lib/Keybindings.hs
+++ b/.config/XMonad/lib/Keybindings.hs
@@ -107,9 +107,6 @@ myKeybindings = [
     , ((myModMask .|. controlMask, xK_bracketleft ), swapPrevScreen)
     , ((myModMask .|. controlMask, xK_bracketright), swapNextScreen)
 
-    -- toggle both bars
-    , ((myModMask, xK_a), sendMessage ToggleStruts)
-
     -- toggle maximize
     , ((myModMask, xK_f), withFocused (sendMessage . maximizeRestore))
 
@@ -170,69 +167,79 @@ myKeybindingsP = [
     , ("<XF86AudioMute>",         spawn volMute)
     -- actions
     -- TODO: add reboot, shutdown, logout, copy, cut, paste
-    , ("M-a w",                   spawn volMute)
-    , ("M-a S-w",                 spawn wifiOn)
-    , ("M-a s",                   spawn wifiOff)
-    , ("M-a S-s",                 spawn fullScreenshot)
-    , ("M-a m",                   spawn volMute)
+    , ("M-a w",     spawn volMute)
+    , ("M-a S-w",   spawn wifiOn)
+    , ("M-a s",     spawn wifiOff)
+    , ("M-a S-s",   spawn fullScreenshot)
+    , ("M-a m",     spawn volMute)
     -- media
-    , ("M-m w",                   myScratchpad "wallpaper")
-    , ("M-m o",                   spawn "obs")
-    , ("M-m S-o",                 spawn "osu")
-    , ("M-m s",                   spawn "syncplay")
-    , ("M-m g",                   spawn "gimp")
-    , ("M-m k",                   spawn "kdenlive")
-    , ("M-m l",                   spawn "lutris")
-    , ("M-m v",                   spawn "vlc")
-    , ("M-m m",                   spawn "minecraft-launcher")
+    , ("M-m w",     myScratchpad "wallpaper")
+    , ("M-m o",     spawn "obs")
+    , ("M-m S-o",   spawn "osu")
+    , ("M-m s",     spawn "syncplay")
+    , ("M-m g",     spawn "gimp")
+    , ("M-m k",     spawn "kdenlive")
+    , ("M-m l",     spawn "lutris")
+    , ("M-m v",     spawn "vlc")
+    , ("M-m m",     spawn "minecraft-launcher")
     -- system apps/scratchpads
-    , ("M-b t",                   spawn myTorrentClient)
-    , ("M-b i",                   spawn myBrowser)
-    , ("M-b d",                   myScratchpad "aarandr")
-    , ("M-b c",                   myScratchpad "calc")
-    , ("M-b b",                   myScratchpad "blueman")
-    , ("M-b p",                   myScratchpad "pavucontrol")
-    , ("M-b m",                   myScratchpad "BPYTOP")
-    , ("M-b n",                   myScratchpad "nmtui")
+    , ("M-b t",     spawn myTorrentClient)
+    , ("M-b i",     spawn myBrowser)
+    , ("M-b d",     myScratchpad "aarandr")
+    , ("M-b c",     myScratchpad "calc")
+    , ("M-b b",     myScratchpad "blueman")
+    , ("M-b p",     myScratchpad "pavucontrol")
+    , ("M-b m",     myScratchpad "BPYTOP")
+    , ("M-b n",     myScratchpad "nmtui")
     -- websites
-    , ("M-n y",                   spawn $ myBrowser ++ " https://youtube.com")
-    , ("M-n d",                   spawn $ myBrowser ++ " https://duckduckgo.com")
-    , ("M-n g",                   spawn $ myBrowser ++ " https://google.com")
-    , ("M-n S-g",                 spawn $ myBrowser ++ " https://github.com")
-    , ("M-n j",                   spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddu55nsz8CezmJJ-GRVISZ1E")
-    , ("M-n k",                   spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddvzCv02lClCfDfUo97wzX1A")
-    , ("M-n c",                   spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWdduy2V0DQQ4Lm0P572XJFVB9")
-    , ("M-n v",                   spawn $ myBrowser ++ " https://vidhukant.xyz")
-    , ("M-n S-v",                 spawn $ myBrowser ++ " https://blog.vidhukant.xyz")
-    , ("M-n m",                   spawn $ myBrowser ++ " https://myanimelist.net/profile/0ZeroTsu")
+    , ("M-n y",     spawn $ myBrowser ++ " https://youtube.com")
+    , ("M-n d",     spawn $ myBrowser ++ " https://duckduckgo.com")
+    , ("M-n g",     spawn $ myBrowser ++ " https://google.com")
+    , ("M-n S-g",   spawn $ myBrowser ++ " https://github.com")
+    , ("M-n j",     spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddu55nsz8CezmJJ-GRVISZ1E")
+    , ("M-n k",     spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddvzCv02lClCfDfUo97wzX1A")
+    , ("M-n c",     spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWdduy2V0DQQ4Lm0P572XJFVB9")
+    , ("M-n v",     spawn $ myBrowser ++ " https://vidhukant.xyz")
+    , ("M-n S-v",   spawn $ myBrowser ++ " https://blog.vidhukant.xyz")
+    , ("M-n m",     spawn $ myBrowser ++ " https://myanimelist.net/profile/0ZeroTsu")
     -- other apps
     -- TODO: add scrcpy
-    , ("M-y t",                   spawn myTorrentClient)
-    , ("M-y S-t",                 spawn "torbrowser-launcher")
-    , ("M-y i",                   spawn myBrowser)
-    , ("M-y d",                   spawn "discord")
-    , ("M-y f",                   spawn "firefox")
-    , ("M-y v",                   spawn "virt-manager")
-    , ("M-y b",                   spawn "brave")
-    , ("M-y p",                   spawn myFileManager)
-    , ("M-y S-p",                 spawn $ myTerminal' ++ " -e " ++ myFileManager')
+    , ("M-y t",     spawn myTorrentClient)
+    , ("M-y S-t",   spawn "torbrowser-launcher")
+    , ("M-y i",     spawn myBrowser)
+    , ("M-y d",     spawn "discord")
+    , ("M-y f",     spawn "firefox")
+    , ("M-y v",     spawn "virt-manager")
+    , ("M-y b",     spawn "brave")
+    , ("M-y p",     spawn myFileManager)
+    , ("M-y S-p",   spawn $ myTerminal' ++ " -e " ++ myFileManager')
     -- XMonad
-    , ("M-q q",                   gridselectWindow myGridSelect >>= flip whenJust (\w -> killWindow w))
-    , ("M-q S-q",                 killAll)
-    , ("M-q r",                   sendMessage Rotate)
-    , ("M-q t",                   sendMessage ToggleStruts)
-    , ("M-q s",                   sendMessage BSP.Swap)
-    , ("M-q g",                   goToSelected myGridSelect)
-    , ("M-q c",                   windows copyToAll)
-    , ("M-q S-c",                 killAllOtherCopies)
-    , ("M-q b",                   bringSelected myGridSelect)
+    , ("M-q q",     gridselectWindow myGridSelect >>= flip whenJust (\w -> killWindow w))
+    , ("M-q S-q",   killAll)
+    , ("M-q r",     sendMessage Rotate)
+    , ("M-q t",     sendMessage ToggleStruts)
+    , ("M-q s",     sendMessage BSP.Swap)
+    , ("M-q g",     goToSelected myGridSelect)
+    , ("M-q x d",   decWindowSpacing 3)
+    , ("M-q x i",   incWindowSpacing 3)
+    , ("M-q x S-d", decScreenSpacing 3)
+    , ("M-q x S-i", incScreenSpacing 3)
+    , ("M-q x b",   setSmartSpacing False)
+    , ("M-q x S-b", setSmartSpacing True)
+    , ("M-q x n",   setWindowSpacingEnabled False)
+    , ("M-q x S-n", setWindowSpacingEnabled True)
+    , ("M-q x m",   setScreenSpacingEnabled False)
+    , ("M-q x S-m", setScreenSpacingEnabled True)
+    , ("M-q c",     windows copyToAll)
+    , ("M-q S-c",   killAllOtherCopies)
+    , ("M-q b",     bringSelected myGridSelect)
     -- resize windows
-    , ("M-q h",                   sendMessage $ ExpandTowards L)
-    , ("M-q j",                   sendMessage $ ExpandTowards D)
-    , ("M-q k",                   sendMessage $ ExpandTowards U)
-    , ("M-q l",                   sendMessage $ ExpandTowards R)
-    , ("M-q S-h",                 sendMessage $ ShrinkFrom L)
-    , ("M-q S-j",                 sendMessage $ ShrinkFrom D)
-    , ("M-q S-k",                 sendMessage $ ShrinkFrom U)
-    , ("M-q S-l",                 sendMessage $ ShrinkFrom R)
+    , ("M-q h",     sendMessage $ ExpandTowards L)
+    , ("M-q j",     sendMessage $ ExpandTowards D)
+    , ("M-q k",     sendMessage $ ExpandTowards U)
+    , ("M-q l",     sendMessage $ ExpandTowards R)
+    , ("M-q S-h",   sendMessage $ ShrinkFrom L)
+    , ("M-q S-j",   sendMessage $ ShrinkFrom D)
+    , ("M-q S-k",   sendMessage $ ShrinkFrom U)
+    , ("M-q S-l",   sendMessage $ ShrinkFrom R)
   ]