From fe066e8e9ca5326dd146630a6d729fae51af12cf Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Tue, 28 May 2013 02:58:25 +0200 Subject: eliminate references to defaultConfig Ignore-this: 37ae613e4b943e99c5200915b9d95e58 darcs-hash:20130528005825-76d51-89eaf6f1aeeb02086371f9c4ae2afade984f62e0.gz --- XMonad/Config/Desktop.hs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'XMonad/Config/Desktop.hs') diff --git a/XMonad/Config/Desktop.hs b/XMonad/Config/Desktop.hs index e05c577..add5548 100644 --- a/XMonad/Config/Desktop.hs +++ b/XMonad/Config/Desktop.hs @@ -22,7 +22,8 @@ module XMonad.Config.Desktop ( -- the DE via a subset of the Extended Window Manager Hints (EWMH) -- specification. Extra xmonad settings unique to specific DE's are -- added by overriding or modifying @desktopConfig@ fields in the - -- same way that @defaultConfig@ is customized in @~\/.xmonad/xmonad.hs@. + -- same way that the default configuration is customized in + -- @~\/.xmonad/xmonad.hs@. -- -- For more information about EWMH see: -- @@ -69,7 +70,7 @@ import qualified Data.Map as M -- -- -- To configure xmonad for use with a DE or with DE tools like panels --- and pagers, in place of @defaultConfig@ in your @~\/.xmonad/xmonad.hs@, +-- and pagers, in place of @def@ in your @~\/.xmonad/xmonad.hs@, -- use @desktopConfig@ or one of the other desktop configs from the -- @XMonad.Config@ namespace. The following setup and customization examples -- work the same way for the other desktop configs as for @desktopConfig@. @@ -88,7 +89,7 @@ import qualified Data.Map as M -- $customizing -- To customize a desktop config, modify its fields as is illustrated with --- @defaultConfig@ in "XMonad.Doc.Extending#Extending xmonad". +-- the default configuration @def@ in "XMonad.Doc.Extending#Extending xmonad". -- $layouts -- See also "XMonad.Util.EZConfig" for more options for modifying key bindings. @@ -163,11 +164,11 @@ import qualified Data.Map as M -- > adjustEventInput -- -desktopConfig = ewmh defaultConfig +desktopConfig = ewmh def { startupHook = setDefaultCursor xC_left_ptr - , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig - , manageHook = manageHook defaultConfig <+> manageDocks - , keys = desktopKeys <+> keys defaultConfig } + , layoutHook = desktopLayoutModifiers $ layoutHook def + , manageHook = manageHook def <+> manageDocks + , keys = desktopKeys <+> keys def } desktopKeys (XConfig {modMask = modm}) = M.fromList $ [ ((modm, xK_b), sendMessage ToggleStruts) ] -- cgit v1.2.3