workspace stuffs

haskell/xmonad/xmonad.hs

@@ -1,76 +1,30 @@
---
--- xmonad example config file.
---
--- A template showing all available configuration hooks,
--- and how to override the defaults in your own xmonad.hs conf file.
---
--- Normally, you'd only override those defaults you care about.
---
-
 import Control.Monad (when)
 import Data.Map qualified as M
 import Data.Monoid
+import Data.Ratio
 import Graphics.X11.ExtraTypes.XF86
 import System.Exit
 import XMonad
 import XMonad.Actions.KeyRemap
 import XMonad.Hooks.EwmhDesktops
+import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.StatusBar
 import XMonad.Hooks.StatusBar.PP
+import XMonad.Layout.Circle
+import XMonad.Layout.DraggingVisualizer
+import XMonad.Layout.Grid
+import XMonad.Layout.IfMax
+import XMonad.Layout.Magnifier
 import XMonad.Layout.Spacing
 import XMonad.Layout.Tabbed
+import XMonad.Layout.ThreeColumns
+import XMonad.Layout.VoidBorders
+import XMonad.Layout.WindowSwitcherDecoration
 import XMonad.Prompt
 import XMonad.Prompt.Layout
 import XMonad.StackSet qualified as W
+import XMonad.Actions.NoBorders
 
--- The preferred terminal program, which is used in a binding below and by
--- certain contrib modules.
---
-myTerminal = "kitty"
-
--- Whether focus follows the mouse pointer.
-myFocusFollowsMouse :: Bool
-myFocusFollowsMouse = False
-
--- Whether clicking on a window to focus also passes the click to the window
-myClickJustFocuses :: Bool
-myClickJustFocuses = False
-
--- Width of the window border in pixels.
---
-myBorderWidth = 2
-
--- modMask lets you specify which modkey you want to use. The default
--- is mod1Mask ("left alt").  You may also consider using mod3Mask
--- ("right alt"), which does not conflict with emacs keybindings. The
--- "windows key" is usually mod4Mask.
---
-myModMask = mod4Mask
-
--- The default number of workspaces (virtual screens) and their names.
--- By default we use numeric strings, but any string may be used as a
--- workspace name. The number of workspaces is determined by the length
--- of this list.
---
--- A tagging example:
---
--- > workspaces = ["web", "irc", "code" ] ++ map show [4..9]
---
-myWorkspaces = ["comms", "browser", "3", "4", "5", "6", "7", "8", "9"]
-
--- Border colors for unfocused and focused windows, respectively.
---
-myNormalBorderColor = "#3c3836"
-
-myFocusedBorderColor = "#504945"
-
-myRemaps = KeymapTable [
-  -- ((0, xK_a), (0, xK_b))
-  ]
-
-------------------------------------------------------------------------
--- Key bindings. Add, modify or remove key bindings here.
---
 myKeys conf@(XConfig {XMonad.modMask = modm}) =
   M.fromList $
     [ ((modm, xK_Return), spawn $ XMonad.terminal conf),
@@ -83,15 +37,12 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
       ((modm, xK_m), spawn "menu-qalc -- -theme gruvbox-dark"),
       ((modm, xK_i), spawn "rofimoji --selector-args '-theme gruvbox-dark' -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"),
       -- screenshotting
-      -- TODO: Fix/rewrite window-screenshot.sh
+      -- TODO: Fix/rewrite window-screenshot
       ((modm, xK_w), spawn "window-screenshot.nu"),
       ((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots"),
       ((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots"),
       ((modm, xK_t), spawn "ocr-screenshot.sh"),
       ((modm .|. shiftMask, xK_t), spawn "DEVICE=\"MELF0410:00 1FD2:7007\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
-      --  Reset the layouts on the current workspace to default
-      -- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
-      -- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
       -- Push window back into tiling
       ((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
       -- Resize viewed windows to the correct size
@@ -109,99 +60,38 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
       ((modm, xK_l), sendMessage Expand),
       -- Increment the number of windows in the master area
       ((modm, xK_comma), sendMessage (IncMasterN 1)),
-      ((modm, xK_period), sendMessage (IncMasterN (-1)))
+      ((modm, xK_period), sendMessage (IncMasterN (-1))),
-      -- Brightness n stuff
+      ((modm, xK_b), sendMessage ToggleStruts >> withFocused toggleBorder),
-      -- , ((0, xF86XK_AudioRaiseVolume),  spawn "amixer -D pulse sset Master 10%+")
+      -- volume keys
-      -- , ((0, xF86XK_AudioLowerVolume),  spawn "amixer -D pulse sset Master 10%-")
+      -- TODO: other media keys
-      -- , ((0, xF86XK_AudioMute),         spawn "amixer -D pulse sset Master toggle")
+      ((0, xF86XK_AudioRaiseVolume), spawn "amixer -D pulse sset Master 10%+"),
-      -- , ((0, xF86XK_MonBrightnessUp),   spawn "brightnessctl set +10%")
+      ((0, xF86XK_AudioLowerVolume), spawn "amixer -D pulse sset Master 10%-"),
-      -- , ((0, xF86XK_MonBrightnessDown), spawn "brightnessctl set 10%-")
+      ((0, xF86XK_AudioMute), spawn "amixer -D pulse sset Master toggle")
-      -- , ((0, xF86XK_KbdBrightnessUp),   spawn "brightnessctl -d \"kbd_backlight\" set +10%")
-      -- , ((0, xF86XK_KbdBrightnessDown), spawn "brightnessctl -d \"kbd_backlight\" set 10%-")
-
-      -- Toggle the status bar gap
-      -- Use this binding with avoidStruts from Hooks.ManageDocks.
-      -- See also the statusBar function from Hooks.DynamicLog.
-      --
-      -- , ((modm              , xK_b     ), sendMessage ToggleStruts)
-
-      -- , ((modm .|. shiftMask, xK_e     ), io (exitWith ExitSuccess))
-
-      -- Restart xmonad
-      -- , ((modm              , xK_q     ), spawn "xmonad --recompile; xmonad --restart")
-
-      -- Run xmessage with a summary of the default keybindings (useful for beginners)
     ]
-      ++
+      ++ [ ((m .|. modm, k), windows $ f i)
-      --
+           | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9],
-      --
+             (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
-      --
+         ]
-      --
-      --
-      --
-      --
-      --
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-[1..9], Switch to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      -- mod-shift-[1..9], Move client to workspace N
-      --
-      --
-      --
-      --
-      --
-      --
-      --
-      --
-      [ ((m .|. modm, k), windows $ f i)
-        | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9],
-          (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
-      ]
 
--- ++
+-- TODO: figure out multi screen stuff, including xinerama
 
---
--- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3
--- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3
---
--- [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f))
---     | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..]
---     , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
-
-------------------------------------------------------------------------
 -- Mouse bindings: default actions bound to mouse events
---
 myMouseBindings (XConfig {XMonad.modMask = modm}) =
   M.fromList
     -- mod-button1, Set the window to floating mode and move by dragging
     [ ( (modm, button1),
-        \w ->
+        \w -> do
-            focus w
+          focus w
-              >> mouseMoveWindow w
+          mouseMoveWindow w
-              >> windows W.shiftMaster
+          windows W.shiftMaster
       ),
       -- mod-button2, Raise the window to the top of the stack
-      ((modm, button2), \w -> focus w >> windows W.shiftMaster),
-      -- mod-button3, Set the window to floating mode and resize by dragging
       ( (modm, button3),
-        \w ->
+        \w -> do
-            focus w
+          focus w
-              >> mouseResizeWindow w
+          mouseResizeWindow w
-              >> windows W.shiftMaster
+          windows W.shiftMaster
       )
-      -- you may also bind events to the mouse scroll wheel (button4 and button5)
     ]
 
 ------------------------------------------------------------------------
@@ -228,39 +118,28 @@ tabCfg =
       urgentTextColor = "#ebdbb2"
     }
 
-myLayout = tiled ||| tabbed shrinkText tabCfg ||| Mirror tiled
+myLayout = avoidStruts $ autoChoose ||| threeCol ||| tiled ||| tabbed shrinkText tabCfg ||| Mirror tiled
   where
     -- default tiling algorithm partitions the screen into two panes
+    autoChoose = IfMax 2 tiled $ IfMax 3 tiled_mag $ IfMax 4 Grid threeCol
     tiled = Tall nmaster delta ratio
-
+    tiled_mag = magnifiercz' 1.4 tiled
+    threeCol = magnifiercz' 1.6 $ ThreeColMid nmaster delta ratio
     -- The default number of windows in the master pane
     nmaster = 1
-
     -- Default proportion of screen occupied by master pane
     ratio = 1 / 2
-
     -- Percent of screen to increment by when resizing panes
     delta = 3 / 100
 
-------------------------------------------------------------------------
--- Window rules:
-
--- Execute arbitrary actions and WindowSet manipulations when managing
--- a new window. You can use this to, for example, always float a
--- particular program, or have a client always appear on a particular
--- workspace.
---
--- To find the property name associated with a program, use
--- > xprop | grep WM_CLASS
--- and click on the client you're interested in.
---
--- To match on the WM_NAME, you can use 'title' in the same way that
--- 'className' and 'resource' are used below.
---
 myManageHook =
   composeAll
     [ className =? "MPlayer" --> doFloat,
       className =? "Gimp" --> doFloat,
+      className =? "firefox" --> doShift "browser",
+      className =? "Evolution" --> doShift "comms",
+      className =? "Signal" --> doShift "comms",
+      className =? "SchildiChat" --> doShift "comms",
       resource =? "desktop_window" --> doIgnore,
       resource =? "kdesktop" --> doIgnore
     ]
@@ -299,13 +178,11 @@ myLogHook = return ()
 --
 -- By default, do nothing.
 myStartupHook = do
-  spawn "pkill oneko; oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"
+  spawn "pgrep oneko || oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"
-  -- spawn "pkill polybar; polybar"
+  spawn "pgrep volumeicon || volumeicon"
-  spawn "pkill volumeicon; volumeicon"
+  spawn "pgrep nm-applet || nm-applet"
-  spawn "pkill nm-applet; nm-applet"
+  spawn "pgrep mullvad-gui || mullvad-vpn"
-  spawn "mullvad-vpn --background"
   spawn "feh --bg-fill ~/Pictures/wallpaper.jpg"
-  setDefaultKeyRemap myRemaps [myRemaps]
 
 ------------------------------------------------------------------------
 -- Now run xmonad with all the defaults we set up.
@@ -314,7 +191,7 @@ myStartupHook = do
 --
 mySB = statusBarProp "polybar" (pure xmobarPP)
 
-main = xmonad $ withEasySB mySB defToggleStrutsKey (ewmh defaults)
+main = xmonad $ docks $  withSB mySB (ewmh defaults)
 
 -- A structure containing your configuration settings, overriding
 -- fields in the default config. Any you don't override, will
@@ -325,14 +202,14 @@ main = xmonad $ withEasySB mySB defToggleStrutsKey (ewmh defaults)
 defaults =
   def
     { -- simple stuff
-      terminal = myTerminal,
+      terminal = "kitty",
-      focusFollowsMouse = myFocusFollowsMouse,
+      focusFollowsMouse = False,
-      clickJustFocuses = myClickJustFocuses,
+      clickJustFocuses = False,
-      borderWidth = myBorderWidth,
+      borderWidth = 2,
-      modMask = myModMask,
+      modMask = mod4Mask,
-      workspaces = myWorkspaces,
+      workspaces = ["comms", "browser"] ++ map show [3 .. 9],
-      normalBorderColor = myNormalBorderColor,
+      normalBorderColor = "#3c3836",
-      focusedBorderColor = myFocusedBorderColor,
+      focusedBorderColor = "#504945",
       -- , clientMask = focusChangeMask .|. XMonad.clientMask
       -- key bindings
       keys = myKeys,