M xmonad.hs → xmonad.hs

@@ -1,4 +1,3 @@
-import qualified Data.Map as M
 import System.Exit
 
 import XMonad
@@ -74,7 +73,7 @@ , ("M-t",        withFocused $ windows . W.sink)
          , ("M-S-t",      sinkAll)
          , ("M-<Tab>",    toggleWindowSpacingEnabled >> toggleScreenSpacingEnabled)
 
-         , ("M-S-q",      io (exitWith ExitSuccess))
+         , ("M-S-q",      io exitSuccess)
          , ("M-S-r",      spawn "xmonad --recompile && xmonad --restart")
 
          , ("<XF86AudioPlay>",        spawn $ myMocp ++ " -G")
@@ -85,7 +84,7 @@ , ("<XF86AudioNext>",        spawn $ myMocp ++ " --next")
          ]
          ++
          [("M-" ++ m ++ show k, windows $ f i)
-             | (i, k) <- zip (myWorkspaces) [1..9]
+             | (i, k) <- zip myWorkspaces [1..9]
              , (f, m) <- [(W.greedyView, ""), (W.shift, "S-")]
          ]
 
@@ -138,11 +137,11 @@ $ tiled ||| threeCol
          where
             tiled    = renamed [Replace "\xe624"] -- lawa
                      $ addTabs shrinkText myTabTheme
-                     $ subLayout [] (Simplest)
+                     $ subLayout [] Simplest
                      $ spacingWithEdge space $ ResizableTall nmaster delta ratio []
             threeCol = renamed [Replace "\xe665"] -- supa
                      $ addTabs shrinkText myTabTheme
-                     $ subLayout [] (Simplest)
+                     $ subLayout [] Simplest
                      $ spacingWithEdge space $ ResizableThreeColMid nmaster delta ratio []
             full     = renamed [Replace "\xe663"] -- suli
                      $ noBorders Full
@@ -158,11 +157,11 @@ , layoutHook         = myLayout
          , manageHook         = myManageHook
          , workspaces         = myWorkspaces
          , borderWidth        = myBorderWidth
-         , keys               = const M.empty -- discard default keybindings
+         , keys               = (`mkKeymap` myKeys)
          , normalBorderColor  = col_bg_alt def
          , focusedBorderColor = col_fg_alt def
          , startupHook = return () >> checkKeymap myConfig myKeys
-         } `additionalKeysP` myKeys
+         }
 
 main :: IO ()
 main = xmonad