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

[XMonad] Use greedy raise/bring next maybe

Browse Source
This commit is contained in:
Ivan Malison 2016-10-26 18:11:18 -07:00
parent 3fe5dfdd6d
commit 3e5e8a0f83
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dotfiles/xmonad/xmonad.hs
View File

@ -144,6 +144,17 @@ greedyFocusWindow w ws = W.focusWindow w $ W.greedyView
shiftToEmptyAndView = doTo Next EmptyWS DWO.getSortByOrder shiftToEmptyAndView = doTo Next EmptyWS DWO.getSortByOrder
(windows . shiftThenView) (windows . shiftThenView)
myRaiseNextMaybe = raiseNextMaybeCustomFocus greedyFocusWindow
myBringNextMaybe = raiseNextMaybeCustomFocus bringWindow
bindBringAndRaise :: KeyMask -> KeySym -> X () -> Query Bool -> [((KeyMask, KeySym), X ())]
bindBringAndRaise mask sym start query =
[ ((mask, sym), myRaiseNextMaybe start query)
, ((mask .|. controlMask, sym), myBringNextMaybe start query)]
bindBringAndRaiseMany :: [(KeyMask, KeySym, X (), Query Bool)] -> [((KeyMask, KeySym), X())]
bindBringAndRaiseMany = concatMap (\(a, b, c, d) -> bindBringAndRaise a b c d)
addKeys conf@XConfig {modMask = modm} = addKeys conf@XConfig {modMask = modm} =
[ ((modm, xK_p), spawn "rofi -show drun") [ ((modm, xK_p), spawn "rofi -show drun")
, ((modm .|. shiftMask, xK_p), spawn "rofi -show run") , ((modm .|. shiftMask, xK_p), spawn "rofi -show run")
@ -159,12 +170,6 @@ addKeys conf@XConfig {modMask = modm} =
, ((modm .|. shiftMask, xK_m), sendMessage RestoreNextMinimizedWin) , ((modm .|. shiftMask, xK_m), sendMessage RestoreNextMinimizedWin)
, ((modm, xK_backslash), toggleWS) , ((modm, xK_backslash), toggleWS)
-- App shortcuts
, ((modalt, xK_s), raiseNextMaybe (spawn "spotify") spotifySelector)
, ((modalt, xK_e), raiseNextMaybe (spawn "emacsclient -c") emacsSelector)
, ((modalt, xK_c), raiseNextMaybe (spawn "google-chrome") chromeSelector)
, ((modalt, xK_h), raiseNextMaybe (spawn "cool") hangoutsSelector)
-- Hyper bindings -- Hyper bindings
, ((mod3Mask, xK_1), setWorkspaceNames) , ((mod3Mask, xK_1), setWorkspaceNames)
, ((mod3Mask, xK_e), moveTo Next EmptyWS ) , ((mod3Mask, xK_e), moveTo Next EmptyWS )
@ -189,8 +194,13 @@ addKeys conf@XConfig {modMask = modm} =
, ((mod3Mask, xK_w), spawn "pactl set-sink-volume 0 +05%") , ((mod3Mask, xK_w), spawn "pactl set-sink-volume 0 +05%")
, ((mod3Mask, xK_s), spawn "pactl set-sink-volume 0 -05%") , ((mod3Mask, xK_s), spawn "pactl set-sink-volume 0 -05%")
] ++ ] ++ bindBringAndRaiseMany
[ (modalt, xK_s, spawn "spotify", spotifySelector)
, (modalt, xK_e, spawn "emacsclient -c", emacsSelector)
, (modalt, xK_c, spawn "google-chrome", chromeSelector)
, (modalt, xK_h, spawn "cool", hangoutsSelector)
] ++
-- Replace original moving stuff around + greedy view bindings -- Replace original moving stuff around + greedy view bindings
[((additionalMask .|. modm, key), windows $ function workspace) [((additionalMask .|. modm, key), windows $ function workspace)
| (workspace, key) <- zip (workspaces conf) [xK_1 .. xK_9] | (workspace, key) <- zip (workspaces conf) [xK_1 .. xK_9]