chore: refactor + keybinds
This commit is contained in:
parent
943eb302ac
commit
f840b1d49e
GPG key ID:
8563E358D4E8040E
173
src/xmonad.hs
173
src/xmonad.hs
|
|
@ -1,5 +1,6 @@
|
||||||
import XMonad
|
import XMonad
|
||||||
import XMonad.Actions.CycleWS
|
import XMonad.Actions.CycleWS
|
||||||
|
import XMonad.Actions.Navigation2D
|
||||||
import XMonad.Hooks.DynamicLog
|
import XMonad.Hooks.DynamicLog
|
||||||
import XMonad.Hooks.EwmhDesktops
|
import XMonad.Hooks.EwmhDesktops
|
||||||
import XMonad.Hooks.ManageDocks
|
import XMonad.Hooks.ManageDocks
|
||||||
|
|
@ -17,12 +18,16 @@ import XMonadConfig.GruvboxMaterial
|
||||||
|
|
||||||
{- FOURMOLU_DISABLE -}
|
{- FOURMOLU_DISABLE -}
|
||||||
|
|
||||||
-- | The main function
|
--
|
||||||
|
-- The main function
|
||||||
|
--
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = xmonad
|
main = xmonad
|
||||||
. docks
|
. docks
|
||||||
. ewmhFullscreen
|
. ewmhFullscreen
|
||||||
. ewmh
|
. ewmh
|
||||||
|
. withNavigation2DConfig def
|
||||||
. withSB myXmobar
|
. withSB myXmobar
|
||||||
$ myConfig
|
$ myConfig
|
||||||
|
|
||||||
|
|
@ -37,7 +42,11 @@ myConfig = def
|
||||||
, manageHook = myManageHook
|
, manageHook = myManageHook
|
||||||
} `additionalKeys` myKeybindings
|
} `additionalKeys` myKeybindings
|
||||||
|
|
||||||
-- | Configuration
|
|
||||||
|
--
|
||||||
|
-- Configuration
|
||||||
|
--
|
||||||
|
|
||||||
myTerminal = "wezterm"
|
myTerminal = "wezterm"
|
||||||
myModMask = mod4Mask
|
myModMask = mod4Mask
|
||||||
myBorderWidth = 5
|
myBorderWidth = 5
|
||||||
|
|
@ -49,72 +58,108 @@ myScrot = "scrot -s '%Y%m%d_%H%M%S.png' -e 'mv $f ~/Pictures/scrots
|
||||||
volumeDown = "pactl set-sink-volume @DEFAULT_SINK@ -10%"
|
volumeDown = "pactl set-sink-volume @DEFAULT_SINK@ -10%"
|
||||||
volumeUp = "pactl set-sink-volume @DEFAULT_SINK@ +10%"
|
volumeUp = "pactl set-sink-volume @DEFAULT_SINK@ +10%"
|
||||||
|
|
||||||
-- | Keybindings
|
|
||||||
|
--
|
||||||
|
-- Keybindings
|
||||||
|
--
|
||||||
|
|
||||||
myKeybindings =
|
myKeybindings =
|
||||||
-- launching and killing programs
|
--
|
||||||
[ ((myModMask, xK_Return), spawn myTerminal) -- %! Launch terminal
|
-- Launching and killing programs
|
||||||
, ((myModMask, xK_Tab ), spawn myLauncher) -- %! Launch rofi
|
--
|
||||||
, ((myModMask, xK_s ), spawn myScrot ) -- %! Take screenshot
|
|
||||||
, ((myModMask, xK_Escape), kill ) -- %! Close the focused window
|
|
||||||
, ((myModMask .|. controlMask, xK_Escape), io exitSuccess ) -- %! Quit xmonad
|
|
||||||
|
|
||||||
-- multimedia
|
[ ((myModMask, xK_Return), spawn myTerminal)
|
||||||
, ((noModMask, xF86XK_AudioPlay ), spawn "mpc toggle") -- %! Play/Pause music
|
, ((myModMask, xK_Tab ), spawn myLauncher)
|
||||||
, ((noModMask, xF86XK_AudioStop ), spawn "mpc stop" ) -- %! Stop music
|
, ((myModMask, xK_s ), spawn myScrot )
|
||||||
, ((noModMask, xF86XK_AudioNext ), spawn "mpc next" ) -- %! Next track
|
, ((myModMask, xK_Escape), kill )
|
||||||
, ((noModMask, xF86XK_AudioPrev ), spawn "mpc prev" ) -- %! Previous track
|
, ((myModMask .|. shiftMask, xK_q ), io exitSuccess )
|
||||||
, ((noModMask, xF86XK_AudioLowerVolume), spawn volumeDown ) -- %! Volume down
|
|
||||||
, ((noModMask, xF86XK_AudioRaiseVolume), spawn volumeUp ) -- %! Volume up
|
|
||||||
|
|
||||||
-- layouts
|
|
||||||
, ((myModMask, xK_t), sendMessage $ JumpToLayout "dynamic tiling" ) -- %! Jump to our tiled layout
|
|
||||||
, ((myModMask, xK_b), sendMessage $ JumpToLayout "binary space partition") -- %! Jump to our bsp layout
|
|
||||||
, ((myModMask, xK_m), sendMessage $ JumpToLayout "maximised" ) -- %! Jump to our maximized layout
|
|
||||||
, ((myModMask, xK_f), sendMessage $ JumpToLayout "fullscreen" ) -- %! Jump to our fullscreen layout
|
|
||||||
, ((myModMask .|. shiftMask, xK_t), withFocused $ windows . W.sink ) -- %! Push window back into tiling
|
|
||||||
|
|
||||||
-- window stack
|
--
|
||||||
, ((myModMask, xK_Down), windows W.focusDown) -- %! Move focus to the next window
|
-- Multimedia
|
||||||
, ((myModMask, xK_Up ), windows W.focusUp ) -- %! Move focus to the previous window
|
--
|
||||||
, ((myModMask .|. shiftMask, xK_Down), windows W.swapDown ) -- %! Swap the focused window with the next window
|
|
||||||
, ((myModMask .|. shiftMask, xK_Up ), windows W.swapUp ) -- %! Swap the focused window with the previous window
|
|
||||||
|
|
||||||
-- master slave
|
, ((noModMask, xF86XK_AudioPlay ), spawn "mpc toggle")
|
||||||
, ((myModMask, xK_space ), windows W.focusMaster ) -- %! Move focus to the master window
|
, ((noModMask, xF86XK_AudioStop ), spawn "mpc stop" )
|
||||||
, ((myModMask .|. shiftMask, xK_space ), windows W.swapMaster ) -- %! Swap the focused window with the master window
|
, ((noModMask, xF86XK_AudioNext ), spawn "mpc next" )
|
||||||
, ((myModMask, xK_Page_Up ), sendMessage Shrink ) -- %! Shrink the master area
|
, ((noModMask, xF86XK_AudioPrev ), spawn "mpc prev" )
|
||||||
, ((myModMask, xK_Page_Down), sendMessage Expand ) -- %! Expand the master area
|
, ((noModMask, xF86XK_AudioLowerVolume), spawn volumeDown )
|
||||||
, ((myModMask .|. shiftMask, xK_Page_Up ), sendMessage (IncMasterN 1) ) -- %! Increase the number of windows in the master area
|
, ((noModMask, xF86XK_AudioRaiseVolume), spawn volumeUp )
|
||||||
, ((myModMask .|. shiftMask, xK_Page_Down), sendMessage (IncMasterN (-1))) -- %! Decrease the number of windows in the master area
|
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Navigation
|
||||||
|
--
|
||||||
|
|
||||||
|
-- directional navigation of windows
|
||||||
|
, ((myModMask, xK_Right), windowGo R False)
|
||||||
|
, ((myModMask, xK_Left ), windowGo L False)
|
||||||
|
, ((myModMask, xK_Up ), windowGo U False)
|
||||||
|
, ((myModMask, xK_Down ), windowGo D False)
|
||||||
|
|
||||||
|
-- swap adjacent windows
|
||||||
|
, ((myModMask .|. shiftMask, xK_Right), windowSwap R False)
|
||||||
|
, ((myModMask .|. shiftMask, xK_Left ), windowSwap L False)
|
||||||
|
, ((myModMask .|. shiftMask, xK_Up ), windowSwap U False)
|
||||||
|
, ((myModMask .|. shiftMask, xK_Down ), windowSwap D False)
|
||||||
|
|
||||||
-- workspaces
|
-- workspaces
|
||||||
, ((myModMask, xK_Right), moveTo Next hiddenWS) -- %! Move focus to the next hidden workspace
|
, ((myModMask, xK_Page_Up ), moveTo Prev hiddenWS)
|
||||||
, ((myModMask, xK_Left ), moveTo Prev hiddenWS) -- %! Move focus to the previous hidden workspace
|
, ((myModMask, xK_Page_Down), moveTo Next hiddenWS)
|
||||||
, ((myModMask .|. shiftMask, xK_Right), shiftTo Next hiddenWS) -- %! Move focused window to the next hidden workspace
|
|
||||||
, ((myModMask .|. shiftMask, xK_Left ), shiftTo Prev hiddenWS) -- %! Move focused window to the previous hidden workspace
|
|
||||||
|
|
||||||
-- monitors
|
-- layouts
|
||||||
, ((myModMask, xK_End ), nextScreen ) -- %! Move focus to the next screen
|
, ((myModMask, xK_t), sendMessage $ JumpToLayout "dynamic tiling" )
|
||||||
, ((myModMask, xK_Home), prevScreen ) -- %! Move focus to the previous screen
|
, ((myModMask, xK_b), sendMessage $ JumpToLayout "binary space partition")
|
||||||
, ((myModMask .|. shiftMask, xK_End ), shiftNextScreen) -- %! Move focused window to the next screen
|
, ((myModMask, xK_m), sendMessage $ JumpToLayout "maximised" )
|
||||||
, ((myModMask .|. shiftMask, xK_Home), shiftPrevScreen) -- %! Move focused window to the previous screen
|
, ((myModMask, xK_f), sendMessage $ JumpToLayout "fullscreen" )
|
||||||
|
, ((myModMask .|. shiftMask, xK_t), withFocused $ windows . W.sink )
|
||||||
|
|
||||||
-- binary space partition
|
|
||||||
, ((myModMask .|. mod1Mask, xK_Right ), sendMessage $ ExpandTowardsBy R 0.01) -- %! Expand window towards the right
|
--
|
||||||
, ((myModMask .|. mod1Mask, xK_Left ), sendMessage $ ExpandTowardsBy L 0.01) -- %! Expand window towards the left
|
-- DynamicTiling
|
||||||
, ((myModMask .|. mod1Mask, xK_Down ), sendMessage $ ExpandTowardsBy D 0.01) -- %! Expand window downwards
|
--
|
||||||
, ((myModMask .|. mod1Mask, xK_Up ), sendMessage $ ExpandTowardsBy U 0.01) -- %! Expand window upwards
|
|
||||||
, ((myModMask .|. mod1Mask .|. controlMask, xK_Right ), sendMessage $ ShrinkFromBy R 0.01) -- %! Shrink window from the right
|
-- move/swap focus of master
|
||||||
, ((myModMask .|. mod1Mask .|. controlMask, xK_Left ), sendMessage $ ShrinkFromBy L 0.01) -- %! Shrink window from the left
|
, ((myModMask, xK_BackSpace), windows W.focusMaster)
|
||||||
, ((myModMask .|. mod1Mask .|. controlMask, xK_Down ), sendMessage $ ShrinkFromBy D 0.01) -- %! Shrink window downwards
|
, ((myModMask .|. shiftMask, xK_BackSpace), windows W.swapMaster )
|
||||||
, ((myModMask .|. mod1Mask .|. controlMask, xK_Up ), sendMessage $ ShrinkFromBy U 0.01) -- %! Shrink window upwards
|
|
||||||
, ((myModMask .|. mod1Mask, xK_Page_Up ), sendMessage Rotate ) -- %! Rotate a split (horizontal/vertical) in the BSP
|
-- shrink/expand the master area
|
||||||
, ((myModMask .|. mod1Mask, xK_Page_Down), sendMessage Swap ) -- %! Swap the left child of a split with the right child of split
|
, ((myModMask, xK_Home), sendMessage Shrink)
|
||||||
, ((myModMask .|. mod1Mask, xK_Home ), sendMessage $ SplitShift Prev ) -- %! Shift window by splitting previous neighbour
|
, ((myModMask, xK_End ), sendMessage Expand)
|
||||||
, ((myModMask .|. mod1Mask, xK_End ), sendMessage $ SplitShift Next ) -- %! Shift window by splitting next neighbour
|
|
||||||
|
-- number of windows in the master area
|
||||||
|
, ((myModMask .|. shiftMask, xK_Home), sendMessage (IncMasterN 1) )
|
||||||
|
, ((myModMask .|. shiftMask, xK_End ), sendMessage (IncMasterN (-1)))
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
-- BinarySpacePartition
|
||||||
|
--
|
||||||
|
|
||||||
|
-- expand windows
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Right), sendMessage $ ExpandTowardsBy R 0.01)
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Left ), sendMessage $ ExpandTowardsBy L 0.01)
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Down ), sendMessage $ ExpandTowardsBy D 0.01)
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Up ), sendMessage $ ExpandTowardsBy U 0.01)
|
||||||
|
|
||||||
|
-- shrink windows
|
||||||
|
, ((myModMask .|. mod1Mask .|. controlMask, xK_Right), sendMessage $ ShrinkFromBy R 0.01)
|
||||||
|
, ((myModMask .|. mod1Mask .|. controlMask, xK_Left ), sendMessage $ ShrinkFromBy L 0.01)
|
||||||
|
, ((myModMask .|. mod1Mask .|. controlMask, xK_Down ), sendMessage $ ShrinkFromBy D 0.01)
|
||||||
|
, ((myModMask .|. mod1Mask .|. controlMask, xK_Up ), sendMessage $ ShrinkFromBy U 0.01)
|
||||||
|
|
||||||
|
-- layout manipulation
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Return ), sendMessage Rotate )
|
||||||
|
, ((myModMask .|. mod1Mask, xK_BackSpace), sendMessage Swap )
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Home ), sendMessage $ SplitShift Prev)
|
||||||
|
, ((myModMask .|. mod1Mask, xK_End ), sendMessage $ SplitShift Next)
|
||||||
]
|
]
|
||||||
|
|
||||||
-- | Layouts
|
|
||||||
|
--
|
||||||
|
-- Layouts
|
||||||
|
--
|
||||||
|
|
||||||
myLayouts = myTile ||| myBsp ||| myMax ||| myFull
|
myLayouts = myTile ||| myBsp ||| myMax ||| myFull
|
||||||
where
|
where
|
||||||
-- our layouts
|
-- our layouts
|
||||||
|
|
@ -129,7 +174,11 @@ myLayouts = myTile ||| myBsp ||| myMax ||| myFull
|
||||||
ratio = 2/3 -- Default proportion of screen occupied by master pane
|
ratio = 2/3 -- Default proportion of screen occupied by master pane
|
||||||
delta = 3/100 -- Percent of screen to increment by when resizing panes
|
delta = 3/100 -- Percent of screen to increment by when resizing panes
|
||||||
|
|
||||||
-- | Statusbar
|
|
||||||
|
--
|
||||||
|
-- Statusbar
|
||||||
|
--
|
||||||
|
|
||||||
myXmobar = statusBarPropTo "_XMONAD_LOG_1" "xmobar" (pure myXmobarPP)
|
myXmobar = statusBarPropTo "_XMONAD_LOG_1" "xmobar" (pure myXmobarPP)
|
||||||
|
|
||||||
myXmobarPP :: PP
|
myXmobarPP :: PP
|
||||||
|
|
@ -144,10 +193,14 @@ myXmobarPP = def
|
||||||
, ppOrder = \[ws, l, _] -> [ws, l]
|
, ppOrder = \[ws, l, _] -> [ws, l]
|
||||||
}
|
}
|
||||||
|
|
||||||
-- | ManageHook
|
|
||||||
|
--
|
||||||
|
-- ManageHook
|
||||||
|
--
|
||||||
|
|
||||||
myManageHook = composeAll
|
myManageHook = composeAll
|
||||||
[ className =? "Thunar" --> doFloat
|
[ className =? "Thunar" --> doFloat
|
||||||
, className =? "Ristretto" --> doFloat
|
, className =? "Ristretto" --> doFloat
|
||||||
, className =? "Tk" --> doFloat -- python gui development
|
, className =? "Tk" --> doFloat -- python gui development
|
||||||
, className =? "TkFDialog" --> doFloat
|
, className =? "TkFDialog" --> doFloat -- ^^
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue