-Wall police

XMonad/Actions/Submap.hs

@@ -20,7 +20,7 @@ module XMonad.Actions.Submap (
 
 import Control.Monad.Reader
 
-import XMonad
+import XMonad hiding (keys)
 import XMonad.Operations (cleanMask)
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras

XMonad/Config/Sjanssen.hs

@@ -11,7 +11,6 @@ import XMonad.Hooks.DynamicLog
 import XMonad.Prompt
 import XMonad.Prompt.Shell
 
-import Data.Ratio
 import Data.Bits
 import qualified Data.Map as M
 import Graphics.X11
@@ -20,23 +19,22 @@ sjanssenConfig :: XConfig
 sjanssenConfig = defaultConfig
         { defaultGaps = [(15,0,0,0)]
         , terminal = "urxvt"
-        , workspaces = ["irc", "web"] ++ map show [3..7] ++ ["mail", "im"]
+        , workspaces = ["irc", "web"] ++ map show [3 .. 7 :: Int] ++ ["mail", "im"]
         , logHook = dynamicLogWithPP sjanssenPP
         , modMask = mod4Mask
-        , mouseBindings = \(XConfig {modMask = modMask}) -> M.fromList $
-                [ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w))
-                , ((modMask, button2), (\w -> focus w >> windows W.swapMaster))
-                , ((modMask .|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
+        , mouseBindings = \(XConfig {modMask = modm}) -> M.fromList $
+                [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w))
+                , ((modm, button2), (\w -> focus w >> windows W.swapMaster))
+                , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
         , keys = \c -> mykeys c `M.union` keys defaultConfig c
         , layoutHook = Layout (smartBorders (tiled ||| Mirror tiled ||| Full ||| tabbed shrinkText defaultTConf))
         }
  where
-    mykeys (XConfig {modMask = modMask}) = M.fromList $
-        [((modMask,               xK_p     ), shellPrompt myPromptConfig)]
-    -- default tiling algorithm partitions the screen into two panes
     tiled   = Tall 1 0.5 0.03
 
+    mykeys (XConfig {modMask = modm}) = M.fromList $
+        [((modm,               xK_p     ), shellPrompt myPromptConfig)]
+
     myPromptConfig = defaultXPConfig
                         { position = Top
-                    , promptBorderWidth = 0
-                    }
+                        , promptBorderWidth = 0 }

XMonad/Layout/Spiral.hs

@@ -24,7 +24,6 @@ module XMonad.Layout.Spiral (
                             ) where
 
 import Graphics.X11.Xlib
-import XMonad.Operations
 import Data.Ratio
 import XMonad
 import XMonad.Layouts

XMonad/Prompt/Shell.hs

@@ -28,7 +28,7 @@ import Data.List
 import System.Directory
 import System.IO
 import XMonad.Util.Run
-import XMonad
+import XMonad hiding (config)
 import XMonad.Prompt
 
 -- $usage