diff options
| author | Don Stewart <dons@galois.com> | 2007-11-05 03:48:58 +0100 |
|---|---|---|
| committer | Don Stewart <dons@galois.com> | 2007-11-05 03:48:58 +0100 |
| commit | 86daec2c2c85c9f88f14e850a1255d1bb22e8e70 (patch) | |
| tree | 2f48a8043fa7e7a92cab968f75cea08a092aefba /XMonad | |
| parent | d9c5a9eb7bdb2958754b8b9c559d7a3153c8cb08 (diff) | |
| download | XMonadContrib-86daec2c2c85c9f88f14e850a1255d1bb22e8e70.tar.gz XMonadContrib-86daec2c2c85c9f88f14e850a1255d1bb22e8e70.tar.xz XMonadContrib-86daec2c2c85c9f88f14e850a1255d1bb22e8e70.zip | |
build with optimisations on as usual, fix a few compile errors
darcs-hash:20071105024858-cba2c-487d19f4b02e347f1ae744afcbad0c3e73db01e0.gz
Diffstat (limited to 'XMonad')
| -rw-r--r-- | XMonad/Config/Droundy.hs | 21 | ||||
| -rw-r--r-- | XMonad/Config/Sjanssen.hs | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs index deab5b9..38f009b 100644 --- a/XMonad/Config/Droundy.hs +++ b/XMonad/Config/Droundy.hs @@ -1,6 +1,5 @@ ----------------------------------------------------------------------------- -- | --- Module : DefaultConfig.hs -- Copyright : (c) Spencer Janssen 2007 -- License : BSD3-style (see LICENSE) -- @@ -14,14 +13,18 @@ -- ------------------------------------------------------------------------ -module Main (main) where +module XMonad.Config.Droundy where -- -- Useful imports -- import Control.Monad.Reader ( asks ) -import XMonad hiding (workspaces, manageHook, numlockMask) -import qualified XMonad (workspaces, manageHook, numlockMask) + +import XMonad hiding + (workspaces,manageHook,numlockMask,keys,mouseBindings) +import qualified XMonad + (workspaces,manageHook,numlockMask,keys,mouseBindings) + import XMonad.Layouts hiding ( (|||) ) import XMonad.Operations import qualified XMonad.StackSet as W @@ -29,7 +32,7 @@ import Data.Bits ((.|.)) import qualified Data.Map as M import System.Exit import Graphics.X11.Xlib -import XMonad.EventLoop +import XMonad.Core -- % Extension-provided imports @@ -293,8 +296,8 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel , normalBorderColor = "#dddddd" -- Border color for unfocused windows. , focusedBorderColor = "#00ff00" -- Border color for focused windows. , XMonad.numlockMask = numlockMask - , XMonad.keys = Main.keys - , XMonad.mouseBindings = Main.mouseBindings + , XMonad.keys = keys + , XMonad.mouseBindings = mouseBindings -- | Perform an arbitrary action on each internal state change or X event. -- Examples include: -- * do nothing @@ -305,5 +308,5 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel , XMonad.manageHook = manageHook } -main :: IO () -main = makeMain defaultConfig +-- main :: IO () +-- main = makeMain defaultConfig diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs index 81adec8..8fb7695 100644 --- a/XMonad/Config/Sjanssen.hs +++ b/XMonad/Config/Sjanssen.hs @@ -5,7 +5,7 @@ import qualified XMonad.StackSet as W import XMonad.Layouts import XMonad.Layout.Tabbed import XMonad.Operations -import XMonad.DefaultConfig (defaultConfig) +import XMonad.Config (defaultConfig) import XMonad.Layout.NoBorders import XMonad.Hooks.DynamicLog import XMonad.Prompt |