From 8aafa0c870bbfafb56ecdb8b7c423e9ee95a6c3c Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Sun, 4 Nov 2007 03:03:20 +0100 Subject: Use the layout and workspaces values from the actual configuration used darcs-hash:20071104020320-a5988-9f9b76e313f4de76c45434e828938eae6b83a8fe --- XMonad/DefaultConfig.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'XMonad') diff --git a/XMonad/DefaultConfig.hs b/XMonad/DefaultConfig.hs index bd41696..49f28cf 100644 --- a/XMonad/DefaultConfig.hs +++ b/XMonad/DefaultConfig.hs @@ -162,7 +162,7 @@ keys conf@(XConfig {modMask = modMask}) = M.fromList $ , ((modMask .|. shiftMask, xK_c ), kill) -- %! Close the focused window , ((modMask, xK_space ), sendMessage NextLayout) -- %! Rotate through the available layout algorithms - , ((modMask .|. shiftMask, xK_space ), setLayout $ Layout layout) -- %! Reset the layouts on the current workspace to default + , ((modMask .|. shiftMask, xK_space ), setLayout $ layoutHook conf) -- %! Reset the layouts on the current workspace to default , ((modMask, xK_n ), refresh) -- %! Resize viewed windows to the correct size @@ -201,7 +201,7 @@ keys conf@(XConfig {modMask = modMask}) = M.fromList $ -- mod-[1..9] %! Switch to workspace N -- mod-shift-[1..9] %! Move client to workspace N [((m .|. modMask, k), windows $ f i) - | (i, k) <- zip workspaces [xK_1 .. xK_9] + | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] ++ -- mod-{w,e,r} %! Switch to physical/Xinerama screens 1, 2, or 3 -- cgit v1.2.3