summaryrefslogtreecommitdiff
path: root/desktop/xmonad
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2013-11-05 18:40:32 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2013-11-05 18:40:32 +0000
commit4e4b131784755f4a5a585a3fa6454d8bb48978ee (patch)
treefa1ebe8671b8ab5583386858489a6e9786e47566 /desktop/xmonad
parent6fcb081b5c727356b56e78283a12b6bb9e0207a9 (diff)
downloadresources-4e4b131784755f4a5a585a3fa6454d8bb48978ee.tar.bz2
Rework workspace switching to exclude the other display
Diffstat (limited to 'desktop/xmonad')
-rw-r--r--desktop/xmonad/xmonad.hs23
1 files changed, 11 insertions, 12 deletions
diff --git a/desktop/xmonad/xmonad.hs b/desktop/xmonad/xmonad.hs
index f7f6b21..d3a077d 100644
--- a/desktop/xmonad/xmonad.hs
+++ b/desktop/xmonad/xmonad.hs
@@ -25,6 +25,7 @@ import XMonad.Hooks.FadeInactive
import XMonad.Hooks.ManageHelpers
import XMonad.Util.ExtensibleState as XS
import XMonad.Layout.IndependentScreens (countScreens)
+import XMonad.Hooks.SetWMName
launchInSpeshulTerminal :: String -> String -> X ()
launchInSpeshulTerminal roleTitle cmd = do
@@ -105,18 +106,19 @@ main = do
. minimize
. mkToggle (single FULL)
$ (layoutHook gnomeConfig)
+ , startupHook = startupHook gnomeConfig >> setWMName "LG3D"
} `EZ.additionalKeysP`
[ -- General keys
("M-x", spawn "gnome-terminal")
, ("M-M1-C-m", launchOrRaiseEmail)
, ("M1-<F2>", shellPrompt defaultXPConfig)
-- Screens, Workspaces and Windows
- , ("M1-C-<Left>", DO.moveTo Prev AnyWS)
- , ("M1-C-<Right>", DO.moveTo Next AnyWS)
- , ("<XF86Back>", DO.moveTo Prev AnyWS)
- , ("<XF86Forward>", DO.moveTo Next AnyWS)
- , ("M1-C-S-<Left>", DO.shiftTo Prev AnyWS >> DO.moveTo Prev AnyWS)
- , ("M1-C-S-<Right>", DO.shiftTo Next AnyWS >> DO.moveTo Next AnyWS)
+ , ("M1-C-<Left>", DO.moveTo Prev HiddenWS)
+ , ("M1-C-<Right>", DO.moveTo Next HiddenWS)
+ , ("<XF86Back>", DO.moveTo Prev HiddenWS)
+ , ("<XF86Forward>", DO.moveTo Next HiddenWS)
+ , ("M1-C-S-<Left>", DO.shiftTo Prev HiddenWS >> DO.moveTo Prev HiddenWS)
+ , ("M1-C-S-<Right>", DO.shiftTo Next HiddenWS >> DO.moveTo Next HiddenWS)
, ("M1-C-<Up>", prevScreen)
, ("M1-C-<Down>", nextScreen)
, ("M1-C-S-<Up>", shiftPrevScreen >> prevScreen)
@@ -132,8 +134,8 @@ main = do
, ("M-t", addWorkspacePrompt defaultXPConfig)
, ("M-r", renameWorkspace defaultXPConfig)
, ("M-w", removeEmptyWorkspace)
- , ("M-C-M1-<Left>", DO.swapWith Prev AnyWS)
- , ("M-C-M1-<Right>", DO.swapWith Next AnyWS)
+ , ("M-C-M1-<Left>", DO.swapWith Prev HiddenWS)
+ , ("M-C-M1-<Right>", DO.swapWith Next HiddenWS)
-- Management keys
, ("M-<F12>", xmonadPrompt defaultXPConfig)
, ("M-S-r", spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi")
@@ -146,8 +148,5 @@ defaultWorkSpaces = ["mail", "term", "www", "emacs"]
extraKeyMappings :: ButtonMask -> [((ButtonMask, KeySym), X ())]
extraKeyMappings modm =
[ ((modm, xK_Menu), spawn "dmenu_shutdown")
- ] ++
- zip (zip (repeat (modm)) [xK_1..xK_9]) (map (withNthWorkspace W.greedyView) [0..])
- ++
- zip (zip (repeat (modm .|. shiftMask)) [xK_1..xK_9]) (map (withNthWorkspace W.shift) [0..])
+ ]