vanadium/xmonad: switch back to tallr

This commit is contained in:
Primrose 2025-12-09 10:08:09 +08:00
parent 1e63c7bb53
commit 18201b4f47
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA

View file

@ -3,7 +3,6 @@
import XMonad import XMonad
import XMonad.Actions.CopyWindow import XMonad.Actions.CopyWindow
import XMonad.Actions.PerWorkspaceKeys
import XMonad.Actions.Submap import XMonad.Actions.Submap
import XMonad.Actions.SwapWorkspaces import XMonad.Actions.SwapWorkspaces
import XMonad.Hooks.DynamicLog import XMonad.Hooks.DynamicLog
@ -15,16 +14,19 @@ import XMonad.Hooks.OnPropertyChange
import XMonad.Hooks.RefocusLast import XMonad.Hooks.RefocusLast
import XMonad.Hooks.StatusBar import XMonad.Hooks.StatusBar
import XMonad.Layout.Accordion import XMonad.Layout.Accordion
import XMonad.Layout.FocusTracking
import XMonad.Layout.Grid import XMonad.Layout.Grid
import XMonad.Layout.IfMax import XMonad.Layout.IfMax
import XMonad.Layout.LimitWindows import XMonad.Layout.LimitWindows
import XMonad.Layout.Maximize import XMonad.Layout.Magnifier hiding (Toggle)
import qualified XMonad.Layout.Magnifier as Mag
import XMonad.Layout.NoBorders import XMonad.Layout.NoBorders
import XMonad.Layout.PerWorkspace import XMonad.Layout.PerWorkspace
import XMonad.Layout.Reflect
import XMonad.Layout.Reflect.Message
import XMonad.Layout.Renamed import XMonad.Layout.Renamed
import XMonad.Layout.ResizableTile import XMonad.Layout.ResizableTile
import XMonad.Layout.Spacing import XMonad.Layout.Spacing
import XMonad.Layout.ThreeColumns
import XMonad.Layout.ToggleLayouts import XMonad.Layout.ToggleLayouts
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import XMonad.Util.EZConfig import XMonad.Util.EZConfig
@ -70,18 +72,20 @@ main =
myLayout = myLayout =
avoidStruts avoidStruts
$ smartBorders $ smartBorders
$ onWorkspace researchWS (ifMaxToggle 2 grid accordion)
$ onWorkspace chatWS (ifMaxToggle 2 grid accordion) $ onWorkspace chatWS (ifMaxToggle 2 grid accordion)
$ onWorkspace multimediaWS (ifMaxToggle 2 grid accordion) $ onWorkspace multimediaWS (ifMaxToggle 2 grid accordion)
-- Magifier doesn't work well with threecol's slaves $ toggleLayouts (focusTracking Full) (mag tallr)
-- Full has the property of "only maximizing the focused one"
-- Maximize can have a window maximized but not focused, might be useful when programming
$ maximizeWithPadding 0 threecol
where where
ifMaxToggle n tog l = ifMax n l (toggleLayouts tog l) ifMaxToggle n tog l = ifMax n l (toggleLayouts tog l)
threecol =
renamed [ Replace "3Col" ] tallr =
renamed [ Replace "Tall" ]
$ smartSpacingWithEdge 5 $ smartSpacingWithEdge 5
$ ThreeColMid 1 (3/100) (1/2) $ reflectMsg . reflectHoriz
$ ResizableTall 1 (1/10) (3/7) []
mag = magnifyxy 1.05 1.3 (NoMaster 3) False
grid = grid =
renamed [ Replace "Grid" ] renamed [ Replace "Grid" ]
@ -294,11 +298,8 @@ keybinds =
, ((superMask, xK_period ), sendMessage Expand ) , ((superMask, xK_period ), sendMessage Expand )
, ((superMask .|. shiftMask, xK_comma ), sendMessage MirrorShrink ) , ((superMask .|. shiftMask, xK_comma ), sendMessage MirrorShrink )
, ((superMask .|. shiftMask, xK_period), sendMessage MirrorExpand ) , ((superMask .|. shiftMask, xK_period), sendMessage MirrorExpand )
, ((superMask , xK_space ), chooseAction $ \ws -> , ((superMask , xK_apostrophe), sendMessage Mag.Toggle )
if ws == chatWS then sendMessage ToggleLayout , ((superMask , xK_space ), sendMessage ToggleLayout )
else if ws == multimediaWS then sendMessage ToggleLayout
else withFocused (sendMessage . maximizeRestore)
)
-- [D]o sink and lift -- [D]o sink and lift
, ( (superMask, xK_d) , ( (superMask, xK_d)
@ -367,6 +368,9 @@ altMask = mod1Mask
myWorkspaces :: [WorkspaceId] myWorkspaces :: [WorkspaceId]
myWorkspaces = map (:[]) $ take 8 greekLower myWorkspaces = map (:[]) $ take 8 greekLower
researchWS :: WorkspaceId
researchWS = myWorkspaces !! 2
chatWS :: WorkspaceId chatWS :: WorkspaceId
chatWS = myWorkspaces !! 3 chatWS = myWorkspaces !! 3