colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:IvanMalison/dotfiles

Browse Source
This commit is contained in:
Ivan Malison 2016-12-25 18:32:45 -08:00
commit e4fdf86459
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dotfiles/xmonad/xmonad.hs
View File

@ -562,7 +562,8 @@ scratchpads =
, NS "volume" volumeCommand volumeSelector nonFloating , NS "volume" volumeCommand volumeSelector nonFloating
] ]
doScratchpad = deactivateFullAnd . namedScratchpadAction scratchpads doScratchpad =
maybeUnminimizeAfter . deactivateFullAnd . namedScratchpadAction scratchpads
-- Raise or spawn -- Raise or spawn
@ -587,17 +588,21 @@ bindBringAndRaiseMany = concatMap (\(a, b, c, d) -> bindBringAndRaise a b c d)
-- Screen shift -- Screen shift
shiftToNextScreen = withWindowSet $ \ws -> shiftToNextScreen ws =
case W.visible ws of case W.visible ws of
W.Screen i _ _:_ -> windows $ W.view (W.tag i) . W.shift (W.tag i) W.Screen i _ _:_ -> W.view (W.tag i) $ W.shift (W.tag i) ws
_ -> return () _ -> ws
goToNextScreen = windows $ \ws -> shiftToNextScreenX = windows shiftToNextScreen
goToNextScreen ws =
case W.visible ws of case W.visible ws of
newVisible:rest -> ws { W.current = newVisible newVisible:rest -> ws { W.current = newVisible
, W.visible = W.current ws:rest , W.visible = W.current ws:rest
} }
_ -> ws _ -> ws
goToNextScreenX = windows goToNextScreen
-- Key bindings -- Key bindings
@ -642,12 +647,12 @@ addKeys conf@XConfig {modMask = modm} =
-- Focus/Layout manipulation -- Focus/Layout manipulation
, ((modm, xK_s), swapNextScreen >> goToNextScreen) , ((modm, xK_s), swapNextScreen >> goToNextScreenX)
, ((modm, xK_e), goToNextScreen) , ((modm, xK_e), goToNextScreenX)
, ((modm, xK_slash), sendMessage $ Toggle MIRROR) , ((modm, xK_slash), sendMessage $ Toggle MIRROR)
, ((modm, xK_backslash), toggleWS) , ((modm, xK_backslash), toggleWS)
, ((modm, xK_space), deactivateFullOr $ sendMessage NextLayout) , ((modm, xK_space), deactivateFullOr $ sendMessage NextLayout)
, ((modm, xK_z), shiftToNextScreen) , ((modm, xK_z), shiftToNextScreenX)
, ((modm .|. shiftMask, xK_z), shiftToEmptyNextScreen) , ((modm .|. shiftMask, xK_z), shiftToEmptyNextScreen)
, ((modm .|. shiftMask, xK_h), shiftToEmptyAndView) , ((modm .|. shiftMask, xK_h), shiftToEmptyAndView)
-- These need to be rebound to support boringWindows -- These need to be rebound to support boringWindows