xmonad: fixes for 0.13

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index bc4edd9308d5ef01582c3841db5960addddfde3b..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
 import XMonad.Actions.CycleRecentWS
 import XMonad.Actions.PhysicalScreens

+import XMonad.Config.Desktop

 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ICCCMFocus
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ICCCMFocus


@@ -160,7 +161,7 @@ myLayout =
 main = do
     xmonadDir <- getXMonadDir
     xmobars <- mapM (\x -> spawnPipe ("xmobar -x " ++ (show x) ++ " " ++ xmonadDir ++ "/xmobar.hs")) [1, 2]
 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,
         manageHook = myManageHook,
         layoutHook = myLayout,
         workspaces = myWorkspaces,


@@ -168,7 +169,7 @@ main = do
         startupHook = myStartupHook,
         keys = myKeys,
         modMask = mod4Mask,
         startupHook = myStartupHook,
         keys = myKeys,
         modMask = mod4Mask,

-        handleEventHook = handleEventHook defaultConfig <+> fullscreenEventHook,
+        handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook,

         focusFollowsMouse = False
     }
 
         focusFollowsMouse = False
     }