xmonad: fixes for 0.13

[dotfiles] / .xmonad / xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index d36078b694fd103c1a7bbd9606abd4473cfd9db3..7fa7a65cea54eb8251b4b01cf9b4e33151a47289 100644 (file)
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -3,6 +3,7 @@ import System.IO
 import XMonad
 import XMonad.Actions.CycleRecentWS
 import XMonad.Actions.PhysicalScreens
+import XMonad.Config.Desktop
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ICCCMFocus
@@ -153,16 +154,14 @@ myGimpLayout = createLayout "Gimp" $
 
 myLayout =
     (
-        onWorkspace "1" (myTabbedLayout ||| myMasterTabbedLayout) $
-        onWorkspace "2" (myTabbedLayout ||| myMasterTabbedLayout) $
-        onWorkspace "9" (myFullLayout ||| myMasterTabbedLayout ||| myTabbedLayout ||| myTiledLayout ||| myGimpLayout) $
-        (myMasterTabbedLayout ||| myTabbedLayout ||| myTiledLayout)
+        onWorkspace "9" (myTabbedLayout ||| myFullLayout ||| myGimpLayout) $
+        (myTabbedLayout ||| myMasterTabbedLayout ||| myTiledLayout)
     )
 
 main = do
     xmonadDir <- getXMonadDir
     xmobars <- mapM (\x -> spawnPipe ("xmobar -x " ++ (show x) ++ " " ++ xmonadDir ++ "/xmobar.hs")) [1, 2]
-    xmonad $ ewmh defaultConfig {
+    xmonad $ desktopConfig {
         manageHook = myManageHook,
         layoutHook = myLayout,
         workspaces = myWorkspaces,
@@ -170,7 +169,7 @@ main = do
         startupHook = myStartupHook,
         keys = myKeys,
         modMask = mod4Mask,
-        handleEventHook = handleEventHook defaultConfig <+> fullscreenEventHook,
+        handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook,
         focusFollowsMouse = False
     }