3 files changed, 45 insertions, 40 deletions
diff --git a/src/Main.hs b/src/Main.hs
index c8cdd19..56c66f5 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -20,7 +20,6 @@ import Rahm.Desktop.Layout
 import Rahm.Desktop.Logger
 import Rahm.Desktop.DMenu (menuCommandString)
 import Rahm.Desktop.RebindKeys
-import Rahm.Desktop.KeysM
 
 import qualified XMonad as X
 import qualified XMonad.StackSet as W
diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs
index 1bf1b2f..fec7ce5 100644
--- a/src/Rahm/Desktop/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -1,67 +1,66 @@
 module Rahm.Desktop.Keys (applyKeys) where
 
-import XMonad.Util.Run (safeSpawn)
-import Data.Monoid (Endo(..))
-import Control.Monad.Trans.Class
-import Control.Monad.Reader
-import Control.Monad.Writer
-import Control.Monad.Trans.Maybe
-import Control.Monad.Loops (iterateWhile)
-import Control.Monad.Fix (fix)
-import Graphics.X11.ExtraTypes.XF86;
-import Rahm.Desktop.KeysM
-import Rahm.Desktop.SwapMaster (swapMaster)
-import XMonad.Hooks.ManageDocks
-import XMonad.Layout.MosaicAlt
-import Graphics.X11.ExtraTypes.XorgDefault
-import System.Process
-import XMonad.Util.Ungrab
-import XMonad.Layout.Spacing
-import Data.Maybe (isJust, fromMaybe)
-import Debug.Trace
 import Control.Applicative
-import Prelude hiding ((!!))
 import Control.Monad
+import Control.Monad.Fix (fix)
+import Control.Monad.Loops (iterateWhile)
+import Control.Monad.Reader
+import Control.Monad.Trans.Class
+import Control.Monad.Trans.Maybe
+import Control.Monad.Writer
 import Data.Char
 import Data.List hiding ((!!))
 import Data.List.Safe ((!!))
 import Data.Map (Map)
-import Rahm.Desktop.Layout
-import Rahm.Desktop.Marking
-import Rahm.Desktop.PromptConfig
+import Data.Maybe (isJust, fromMaybe)
+import Data.Monoid (Endo(..))
+import Debug.Trace
+import Graphics.X11.ExtraTypes.XF86;
+import Graphics.X11.ExtraTypes.XorgDefault
+import Prelude hiding ((!!))
 import System.IO
+import System.Process
 import Text.Printf
 import XMonad
-import Rahm.Desktop.Submap
+import XMonad.Actions.CopyWindow as CopyWindow
+import XMonad.Actions.RotSlaves
+import XMonad.Actions.SpawnOn as SpawnOn
 import XMonad.Actions.WindowNavigation
+import XMonad.Hooks.ManageDocks
+import XMonad.Layout.MosaicAlt
+import XMonad.Layout.Spacing
 import XMonad.Prompt
 import XMonad.Prompt.Input
 import XMonad.Prompt.Shell
 import XMonad.Util.CustomKeys
+import XMonad.Util.Run (safeSpawn)
 import XMonad.Util.Scratchpad
-import XMonad.Actions.RotSlaves
-import XMonad.Actions.CopyWindow as CopyWindow
-import XMonad.Actions.SpawnOn as SpawnOn
+import XMonad.Util.Ungrab
 
 import qualified Data.Map as Map
 import qualified XMonad.StackSet as W
 
-import Rahm.Desktop.MouseMotion
-import Rahm.Desktop.Windows
-import Rahm.Desktop.Lib
 import Rahm.Desktop.DMenu
-import Rahm.Desktop.PassMenu
-import Rahm.Desktop.Logger
-import Rahm.Desktop.RebindKeys
-import Rahm.Desktop.Swallow
-import Rahm.Desktop.Layout.List (
-  toNextLayout, toPreviousLayout, toFirstLayout, toIndexedLayout)
+import Rahm.Desktop.Keys.Dsl
+import Rahm.Desktop.Layout
+import Rahm.Desktop.Layout.ConsistentMosaic
+import Rahm.Desktop.Layout.Flip (flipHorizontally, flipVertically)
 import Rahm.Desktop.Layout.Hole (toggleHole)
+import Rahm.Desktop.Layout.List (toNextLayout, toPreviousLayout, toFirstLayout, toIndexedLayout)
 import Rahm.Desktop.Layout.Pop (togglePop)
-import Rahm.Desktop.Layout.Flip (flipHorizontally, flipVertically)
 import Rahm.Desktop.Layout.Rotate (rotateLayout)
+import Rahm.Desktop.Lib
+import Rahm.Desktop.Logger
+import Rahm.Desktop.Marking
+import Rahm.Desktop.MouseMotion
+import Rahm.Desktop.PassMenu
+import Rahm.Desktop.PromptConfig
+import Rahm.Desktop.RebindKeys
 import Rahm.Desktop.ScreenRotate (screenRotateForward, screenRotateBackward)
-import Rahm.Desktop.Layout.ConsistentMosaic
+import Rahm.Desktop.Submap
+import Rahm.Desktop.Swallow
+import Rahm.Desktop.SwapMaster (swapMaster)
+import Rahm.Desktop.Windows
 import Rahm.Desktop.Workspaces
 
 type KeyMap l = XConfig l -> Map (KeyMask, KeySym) (X ())
@@ -851,8 +850,14 @@ windowSpecificBindings config = do
       rawMask (controlMask .|. shiftMask) $ emitKey (0, xK_Home)
 
     bind xK_d $
+      rawMask controlMask $ emitKey (controlMask .|. shiftMask, xK_Tab)
+
+    bind xK_Escape $
       rawMask controlMask $ emitKey (controlMask, xK_w)
 
+    bind xK_i $ do
+      rawMask controlMask $ emitKey (controlMask, xK_Tab)
+
     bind xK_F2 $
       -- Experimental.
       noMod $ logs "This is a test"
diff --git a/src/Rahm/Desktop/KeysM.hs b/src/Rahm/Desktop/Keys/Dsl.hs
index 403b3fc..2c596fc 100644
--- a/src/Rahm/Desktop/KeysM.hs
+++ b/src/Rahm/Desktop/Keys/Dsl.hs
@@ -1,4 +1,5 @@
-module Rahm.Desktop.KeysM where
+-- Domain-specific language for configuring key/button bindings.
+module Rahm.Desktop.Keys.Dsl where
 
 import Data.List
 import Data.Bits ((.&.))