add bsp layout, update keybinds
This commit is contained in:
parent
186901ff91
commit
b636d31d9d
|
@ -14,6 +14,7 @@ import XMonad.Hooks.ManageDocks
|
||||||
import XMonad.Layout.Spacing
|
import XMonad.Layout.Spacing
|
||||||
import XMonad.Layout.Renamed
|
import XMonad.Layout.Renamed
|
||||||
import XMonad.Layout.NoBorders
|
import XMonad.Layout.NoBorders
|
||||||
|
import XMonad.Layout.BinarySpacePartition
|
||||||
|
|
||||||
-- Utilities
|
-- Utilities
|
||||||
import XMonad.Util.EZConfig (additionalKeys)
|
import XMonad.Util.EZConfig (additionalKeys)
|
||||||
|
@ -42,62 +43,78 @@ volUp = "pactl set-sink-volume @DEFAULT_SINK@ +10%"
|
||||||
-- | Keybindings
|
-- | Keybindings
|
||||||
myKeys =
|
myKeys =
|
||||||
-- launching and killing programs
|
-- launching and killing programs
|
||||||
[ ((myModMask, xK_n ), spawn myTerminal ) -- %! Launch terminal
|
[ ((myModMask, xK_Return), spawn myTerminal ) -- %! Launch terminal
|
||||||
, ((myModMask, xK_e ), spawn myLauncher ) -- %! Launch rofi
|
, ((myModMask, xK_Tab ), spawn myLauncher ) -- %! Launch rofi
|
||||||
, ((myModMask, xK_s ), spawn myScrot ) -- %! Take screenshot
|
, ((myModMask, xK_s ), spawn myScrot ) -- %! Take screenshot
|
||||||
, ((myModMask, xK_Escape ), kill ) -- %! Close the focused window
|
, ((myModMask, xK_Escape), kill ) -- %! Close the focused window
|
||||||
, ((myModMask .|. controlMask, xK_Escape ), io exitSuccess ) -- %! Quit xmonad
|
, ((myModMask .|. controlMask, xK_Escape), io exitSuccess ) -- %! Quit xmonad
|
||||||
|
|
||||||
-- multimedia
|
-- multimedia
|
||||||
, ((noModMask, xF86XK_AudioPlay ), spawn "mpc toggle" ) -- %! Play/Pause music
|
, ((noModMask, xF86XK_AudioPlay ), spawn "mpc toggle") -- %! Play/Pause music
|
||||||
, ((noModMask, xF86XK_AudioStop ), spawn "mpc stop" ) -- %! Stop music
|
, ((noModMask, xF86XK_AudioStop ), spawn "mpc stop" ) -- %! Stop music
|
||||||
, ((noModMask, xF86XK_AudioNext ), spawn "mpc next" ) -- %! Next track
|
, ((noModMask, xF86XK_AudioNext ), spawn "mpc next" ) -- %! Next track
|
||||||
, ((noModMask, xF86XK_AudioPrev ), spawn "mpc prev" ) -- %! Previous track
|
, ((noModMask, xF86XK_AudioPrev ), spawn "mpc prev" ) -- %! Previous track
|
||||||
, ((noModMask, xF86XK_AudioLowerVolume ), spawn volDown ) -- %! Volume down
|
, ((noModMask, xF86XK_AudioLowerVolume ), spawn volDown ) -- %! Volume down
|
||||||
, ((noModMask, xF86XK_AudioRaiseVolume ), spawn volUp ) -- %! Volume up
|
, ((noModMask, xF86XK_AudioRaiseVolume ), spawn volUp ) -- %! Volume up
|
||||||
|
|
||||||
-- layouts
|
-- layouts
|
||||||
, ((myModMask, xK_t ), sendMessage $ JumpToLayout "spacing tiled") -- %! Jump to our tiled layout
|
, ((myModMask, xK_t ), sendMessage $ JumpToLayout "tile") -- %! Jump to our tiled layout
|
||||||
, ((myModMask, xK_m ), sendMessage $ JumpToLayout "maximized" ) -- %! Jump to our maximized layout
|
, ((myModMask, xK_b ), sendMessage $ JumpToLayout "bsp" ) -- %! Jump to our bsp layout
|
||||||
, ((myModMask, xK_f ), sendMessage $ JumpToLayout "fullscreen" ) -- %! Jump to our fullscreen layout
|
, ((myModMask, xK_m ), sendMessage $ JumpToLayout "max" ) -- %! Jump to our maximized layout
|
||||||
, ((myModMask .|. shiftMask, xK_t ), withFocused $ windows . W.sink ) -- %! Push window back into tiling
|
, ((myModMask, xK_f ), sendMessage $ JumpToLayout "full") -- %! Jump to our fullscreen layout
|
||||||
|
, ((myModMask .|. shiftMask, xK_t ), withFocused $ windows . W.sink ) -- %! Push window back into tiling
|
||||||
|
|
||||||
-- window stack
|
-- window stack
|
||||||
, ((myModMask, xK_Down ), windows W.focusDown ) -- %! Move focus to the next window
|
, ((myModMask, xK_Down ), windows W.focusDown ) -- %! Move focus to the next window
|
||||||
, ((myModMask, xK_Up ), windows W.focusUp ) -- %! Move focus to the previous window
|
, ((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_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
|
, ((myModMask .|. shiftMask, xK_Up ), windows W.swapUp ) -- %! Swap the focused window with the previous window
|
||||||
|
|
||||||
-- master slave
|
-- master slave
|
||||||
, ((myModMask, xK_Return ), windows W.focusMaster ) -- %! Move focus to the master window
|
, ((myModMask, xK_space ), windows W.focusMaster ) -- %! Move focus to the master window
|
||||||
, ((myModMask .|. shiftMask, xK_Return ), windows W.swapMaster ) -- %! Swap the focused window with the master window
|
, ((myModMask .|. shiftMask, xK_space ), windows W.swapMaster ) -- %! Swap the focused window with the master window
|
||||||
, ((myModMask, xK_Page_Up ), sendMessage Shrink ) -- %! Shrink the master area
|
, ((myModMask, xK_Page_Up ), sendMessage Shrink ) -- %! Shrink the master area
|
||||||
, ((myModMask, xK_Page_Down), sendMessage Expand ) -- %! Expand the master area
|
, ((myModMask, xK_Page_Down), sendMessage Expand ) -- %! Expand the master area
|
||||||
, ((myModMask .|. shiftMask, xK_Page_Up ), sendMessage (IncMasterN 1) ) -- %! Increase the number of windows in the master area
|
, ((myModMask .|. shiftMask, xK_Page_Up ), sendMessage (IncMasterN 1) ) -- %! Increase the number of windows in the master area
|
||||||
, ((myModMask .|. shiftMask, xK_Page_Down), sendMessage (IncMasterN (-1)) ) -- %! Decrease the number of windows in the master area
|
, ((myModMask .|. shiftMask, xK_Page_Down), sendMessage (IncMasterN (-1)) ) -- %! Decrease the number of windows in the master area
|
||||||
|
|
||||||
-- workspaces
|
-- workspaces
|
||||||
, ((myModMask, xK_Right ), moveTo Next hiddenWS ) -- %! Move focus to the next hidden workspace
|
, ((myModMask, xK_Right ), moveTo Next hiddenWS ) -- %! Move focus to the next hidden workspace
|
||||||
, ((myModMask, xK_Left ), moveTo Prev hiddenWS ) -- %! Move focus to the previous hidden workspace
|
, ((myModMask, xK_Left ), moveTo Prev hiddenWS ) -- %! Move focus to the previous hidden workspace
|
||||||
, ((myModMask .|. shiftMask, xK_Right ), shiftTo Next hiddenWS ) -- %! Move focused window to the next hidden workspace
|
, ((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
|
, ((myModMask .|. shiftMask, xK_Left ), shiftTo Prev hiddenWS ) -- %! Move focused window to the previous hidden workspace
|
||||||
|
|
||||||
-- monitors
|
-- monitors
|
||||||
, ((myModMask, xK_End ), nextScreen ) -- %! Move focus to the next screen
|
, ((myModMask, xK_End ), nextScreen ) -- %! Move focus to the next screen
|
||||||
, ((myModMask, xK_Home ), prevScreen ) -- %! Move focus to the previous screen
|
, ((myModMask, xK_Home ), prevScreen ) -- %! Move focus to the previous screen
|
||||||
, ((myModMask .|. shiftMask, xK_End ), shiftNextScreen ) -- %! Move focused window to the next screen
|
, ((myModMask .|. shiftMask, xK_End ), shiftNextScreen ) -- %! Move focused window to the next screen
|
||||||
, ((myModMask .|. shiftMask, xK_Home ), shiftPrevScreen ) -- %! Move focused window to the previous screen
|
, ((myModMask .|. shiftMask, xK_Home ), shiftPrevScreen ) -- %! Move focused window to the previous screen
|
||||||
|
|
||||||
|
-- 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
|
||||||
|
, ((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
|
||||||
|
, ((myModMask .|. mod1Mask .|. controlMask, xK_Left ), sendMessage $ ShrinkFromBy L 0.01) -- %! Shrink window from the left
|
||||||
|
, ((myModMask .|. mod1Mask .|. controlMask, xK_Down ), sendMessage $ ShrinkFromBy D 0.01) -- %! Shrink window downwards
|
||||||
|
, ((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
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Page_Down), sendMessage Swap ) -- %! Swap the left child of a split with the right child of split
|
||||||
|
, ((myModMask .|. mod1Mask, xK_Home ), sendMessage $ SplitShift Prev ) -- %! Shift window by splitting previous neighbour
|
||||||
|
, ((myModMask .|. mod1Mask, xK_End ), sendMessage $ SplitShift Next ) -- %! Shift window by splitting next neighbour
|
||||||
]
|
]
|
||||||
|
|
||||||
-- | Layouts
|
-- | Layouts
|
||||||
myLayout = tiled ||| max ||| full
|
myLayout = tile ||| bsp ||| max ||| full
|
||||||
where
|
where
|
||||||
-- Add a configurable amount of space around windows.
|
-- Add a configurable amount of space around windows.
|
||||||
gaps = spacingRaw False (Border 10 10 10 10) True (Border 10 10 10 10) True
|
gaps = spacingRaw False (Border 10 10 10 10) True (Border 10 10 10 10) True
|
||||||
-- Our layouts
|
-- Our layouts
|
||||||
tiled = renamed [Replace "spacing tiled"] . avoidStruts . gaps $ Tall nmaster delta ratio
|
tile = renamed [Replace "tile"] . avoidStruts . gaps $ Tall nmaster delta ratio
|
||||||
max = renamed [Replace "maximized" ] . avoidStruts . gaps $ Full
|
bsp = renamed [Replace "bsp" ] . avoidStruts . gaps $ emptyBSP
|
||||||
full = renamed [Replace "fullscreen" ] . noBorders $ Full
|
max = renamed [Replace "max" ] . avoidStruts . gaps $ Full
|
||||||
|
full = renamed [Replace "full"] . noBorders $ Full
|
||||||
-- Layout settings
|
-- Layout settings
|
||||||
nmaster = 1 -- Default number of windows in the master pane
|
nmaster = 1 -- Default number of windows in the master pane
|
||||||
ratio = 1/2 -- Default proportion of screen occupied by master pane
|
ratio = 1/2 -- Default proportion of screen occupied by master pane
|
||||||
|
|
Loading…
Reference in a new issue