change some bindings and reorder a few things

This commit is contained in:
frosty 2024-07-05 10:57:30 -04:00
parent ea57dc7158
commit b9b99c7430

View file

@ -3,18 +3,19 @@ import XMonad.Layout.Grid
import XMonad.Layout.LayoutModifier import XMonad.Layout.LayoutModifier
import XMonad.Layout.NoBorders (noBorders, smartBorders) import XMonad.Layout.NoBorders (noBorders, smartBorders)
import XMonad.Layout.Renamed (named) import XMonad.Layout.Renamed (named)
import XMonad.Layout.ShowWName
import XMonad.Layout.Spacing import XMonad.Layout.Spacing
import XMonad.Actions.CycleWS
import XMonad.Actions.Submap
import XMonad.Actions.ToggleFullFloat
import XMonad.Hooks.DynamicLog import XMonad.Hooks.DynamicLog
import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.EwmhDesktops
import XMonad.Hooks.InsertPosition import XMonad.Hooks.InsertPosition
import XMonad.Hooks.ManageDocks (avoidStruts, manageDocks) import XMonad.Hooks.ManageDocks (avoidStruts, manageDocks, ToggleStruts(..))
import XMonad.Hooks.Place import XMonad.Hooks.Place
import XMonad.Hooks.StatusBar import XMonad.Hooks.StatusBar
import XMonad.Hooks.WindowSwallowing import XMonad.Hooks.WindowSwallowing
import XMonad.Util.NamedScratchpad import XMonad.Util.NamedScratchpad
import XMonad.Actions.CycleWS
import XMonad.Actions.Submap
import XMonad.Actions.ToggleFullFloat
import Data.Monoid import Data.Monoid
import Graphics.X11.ExtraTypes.XF86 import Graphics.X11.ExtraTypes.XF86
import System.Exit import System.Exit
@ -38,6 +39,10 @@ myNormalBorderColor, myFocusedBorderColor :: String
myNormalBorderColor = "#222222" myNormalBorderColor = "#222222"
myFocusedBorderColor = "#80b7ff" myFocusedBorderColor = "#80b7ff"
floatClasses, swallowClasses :: [String]
floatClasses = ["Arandr", "Nsxiv"]
swallowClasses = ["St", "XTerm"]
-- KEY BINDS ----------------------------------------------------------- -- KEY BINDS -----------------------------------------------------------
myKeys :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ()) myKeys :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ())
@ -110,6 +115,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- Master control -- Master control
, ((modMask, xK_h), sendMessage Shrink) , ((modMask, xK_h), sendMessage Shrink)
, ((modMask, xK_b), sendMessage ToggleStruts)
, ((modMask, xK_l), sendMessage Expand) , ((modMask, xK_l), sendMessage Expand)
, ((modMask, xK_i), sendMessage $ IncMasterN 1) , ((modMask, xK_i), sendMessage $ IncMasterN 1)
, ((modMask, xK_d), sendMessage $ IncMasterN $ -1) , ((modMask, xK_d), sendMessage $ IncMasterN $ -1)
@ -170,9 +176,9 @@ myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $
-- Switch to next workspace -- Switch to next workspace
, ((modMask, button5), (\_ -> nextWS)) , ((modMask, button5), (\_ -> nextWS))
-- Send client to previous workspace -- Send client to previous workspace
, (((modMask .|. shiftMask), button4), (\_ -> shiftToPrev >> prevWS)) , ((modMask .|. shiftMask, button4), (\_ -> shiftToPrev >> prevWS))
-- Send client to next workspace -- Send client to next workspace
, (((modMask .|. shiftMask), button5), (\_ -> shiftToNext >> nextWS)) , ((modMask .|. shiftMask, button5), (\_ -> shiftToNext >> nextWS))
] ]
-- LAYOUTS ------------------------------------------------------------- -- LAYOUTS -------------------------------------------------------------
@ -181,13 +187,21 @@ myLayoutHook =
avoidStruts avoidStruts
$ tall ||| wide ||| grid $ tall ||| wide ||| grid
where where
tall = named "tall" tall = named "Tall"
$ Tall 1 (3/100) (1/2) $ Tall 1 (3/100) (1/2)
wide = named "wide" wide = named "Wide"
$ Mirror tall $ Mirror tall
grid = named "grid" grid = named "Grid"
$ Grid $ Grid
mySWNConfig :: SWNConfig
mySWNConfig = def
{ swn_font = "Fira Mono 24"
, swn_fade = 1.0
, swn_bgcolor = "#121212"
, swn_color = "#cccccc"
}
-- SCRATCHPADS --------------------------------------------------------- -- SCRATCHPADS ---------------------------------------------------------
myScratchPads :: [NamedScratchpad] myScratchPads :: [NamedScratchpad]
@ -216,14 +230,10 @@ myManageHook = composeAll
, manageDocks , manageDocks
, composeAll [ className =? c --> doFloat | c <- floatClasses ] , composeAll [ className =? c --> doFloat | c <- floatClasses ]
] ]
where
floatClasses = ["Arandr", "Nsxiv"]
myEventHook :: Event -> X All myEventHook :: Event -> X All
myEventHook = myEventHook =
swallowEventHook (foldr1 (<||>) $ map (\c -> className =? c) swallowClasses) (return True) swallowEventHook (foldr1 (<||>) $ map (\c -> className =? c) swallowClasses) (return True)
where
swallowClasses = ["St", "XTerm"]
myStartupHook :: X () myStartupHook :: X ()
myStartupHook = do myStartupHook = do