Moved key bindings to library

10 files changed, 569 insertions, 470 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7886d91
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.cabal-sandbox/
+dist/
+cabal.sandbox.config
diff --git a/src/XMonad/Local/Actions.hs b/src/XMonad/Local/Actions.hs
index 2ca3a8b..baf738b 100644
--- a/src/XMonad/Local/Actions.hs
+++ b/src/XMonad/Local/Actions.hs
@@ -1,13 +1,16 @@
+{-# LANGUAGE DoAndIfThenElse #-}
+
 module XMonad.Local.Actions where
 
 import XMonad
 import qualified XMonad.Actions.TopicSpace as TS
 
-myExplorer :: String
-myExplorer = "caja"
+-- local modules **************************************************************
+import qualified XMonad.Local.Config as Local
 
+-- launch applications ********************************************************
 spawnExplorer :: MonadIO m => m ()
-spawnExplorer = spawn myExplorer
+spawnExplorer = spawn Local.explorer
 
 spawnShell :: Maybe String -> X()
 spawnShell = spawnShellIn ""
@@ -22,3 +25,15 @@ spawnShellIn dir command = do
 
     cmd' t | dir == "" = t ++ run command
            | otherwise = "cd " ++ dir ++ " && " ++ t ++ run command
+
+mateRun :: X ()
+mateRun = withDisplay $ \dpy -> do
+    rw <- asks theRoot
+    mate_panel <- getAtom "_MATE_PANEL_ACTION"
+    panel_run   <- getAtom "_MATE_PANEL_ACTION_RUN_DIALOG"
+
+    io $ allocaXEvent $ \e -> do
+        setEventType e clientMessage
+        setClientMessageEvent e rw mate_panel 32 panel_run 0
+        sendEvent dpy rw False structureNotifyMask e
+        sync dpy False
diff --git a/src/XMonad/Local/Config.hs b/src/XMonad/Local/Config.hs
new file mode 100644
index 0000000..1f7420d
--- /dev/null
+++ b/src/XMonad/Local/Config.hs
@@ -0,0 +1,23 @@
+module XMonad.Local.Config (
+      explorer
+    , xpConfig
+    , terminal
+    ) where
+
+import qualified XMonad.Prompt as P
+
+explorer :: String
+explorer = "caja"
+
+terminal :: String
+terminal = "mate-terminal"
+
+xpConfig :: P.XPConfig
+xpConfig = P.defaultXPConfig
+    { P.fgColor = "#dfdfdf"
+    , P.bgColor = "#3c3c3c"
+    , P.fgHLight = "#ffffff"
+    , P.bgHLight = "#3c3c3c"
+    , P.font    = "-*-terminus-*-*-*-*-14-*-*-*-*-*-*-*"
+    , P.height  = 24
+    }
diff --git a/src/XMonad/Local/GridSelect.hs b/src/XMonad/Local/GridSelect.hs
new file mode 100644
index 0000000..359cda5
--- /dev/null
+++ b/src/XMonad/Local/GridSelect.hs
@@ -0,0 +1,86 @@
+module XMonad.Local.GridSelect (
+      gsConfig
+    , gsw
+    , gswShift
+    ) where
+
+import Control.Monad
+import Data.List (subsequences)
+import XMonad
+import qualified Data.Map as M
+import XMonad.Actions.GridSelect
+import qualified XMonad.Actions.TopicSpace as TS
+import qualified XMonad.StackSet as W
+
+-- local modules **************************************************************
+import qualified XMonad.Local.TopicSpace as Local
+
+
+gsConfig :: HasColorizer a => GSConfig a
+gsConfig = defaultGSConfig
+    { gs_cellheight = 40
+    , gs_cellwidth = 100
+    , gs_navigate = navigation'
+    }
+  where
+    navigation' :: TwoD a (Maybe a)
+    navigation' = makeXEventhandler
+                $ shadowWithKeymap navKeyMap navHandler
+
+    navKeyMap = M.fromList (allowModifs modifs
+          [ ((0,xK_Escape)     , cancel)
+          , ((0,xK_Return)     , select)
+          , ((0,xK_slash)      , substringSearch navigation')
+          , ((0,xK_question)   , substringSearch navigation')
+          , ((0,xK_Left)       , move (-1,0) >> navigation')
+          , ((0,xK_h)          , move (-1,0) >> navigation')
+          , ((0,xK_H)          , move (-1,0) >> navigation')
+          , ((0,xK_Right)      , move (1,0) >> navigation')
+          , ((0,xK_l)          , move (1,0) >> navigation')
+          , ((0,xK_L)          , move (1,0) >> navigation')
+          , ((0,xK_Down)       , move (0,1) >> navigation')
+          , ((0,xK_j)          , move (0,1) >> navigation')
+          , ((0,xK_J)          , move (0,1) >> navigation')
+          , ((0,xK_Up)         , move (0,-1) >> navigation')
+          , ((0,xK_k)          , move (0,-1) >> navigation')
+          , ((0,xK_K)          , move (0,-1) >> navigation')
+          , ((0,xK_n)          , moveNext >> navigation')
+          , ((0,xK_N)          , moveNext >> navigation')
+          , ((0,xK_p)          , movePrev >> navigation')
+          , ((0,xK_P)          , movePrev >> navigation')
+          ]
+        ++ allowModifs (drop 1 modifs)
+          [ ((0,xK_Tab)         , moveNext >> navigation')
+          , ((shiftMask,xK_Tab) , moveNext >> navigation')
+          ]
+        )
+    modifs :: [KeyMask]
+    modifs = [ shiftMask, lockMask, mod1Mask, mod2Mask
+             , mod3Mask, mod4Mask, mod5Mask ]
+
+    allowModifs :: [ KeyMask ] -> [((KeyMask, a), b)] -> [((KeyMask, a), b)]
+    allowModifs mods keymap = [ ((m .|. o, k), a)
+            | m <- map (foldl (.|.) 0) $ subsequences mods
+            , ((o, k), a) <- keymap ]
+
+    -- The navigation handler ignores unknown key symbols
+    navHandler = const navigation'
+
+gsw :: X()
+gsw = gsw' W.greedyView
+  where
+    gsw' :: (WorkspaceId -> WindowSet -> WindowSet) -> X ()
+    gsw' viewFunc = withWindowSet $ \ws -> do
+        let wss = map W.tag $ fHidden ws ++ map W.workspace (W.current ws : W.visible ws)
+        gridselect gsConfig (zip wss wss) >>= flip whenJust (switchTopic' viewFunc)
+    fHidden = filter ((/=) "NSP" . W.tag) . W.hidden
+
+gswShift :: X()
+gswShift = gridselectWorkspace gsConfig (\ws -> W.greedyView ws . W.shift ws)
+
+switchTopic' :: (WorkspaceId -> WindowSet -> WindowSet)
+                -> TS.Topic -> X ()
+switchTopic' viewMethod topic = do
+   windows $ viewMethod topic
+   wins <- gets (W.integrate' . W.stack . W.workspace . W.current . windowset)
+   when (null wins) $ TS.topicAction Local.topicConfig topic
diff --git a/src/XMonad/Local/Keys.hs b/src/XMonad/Local/Keys.hs
new file mode 100644
index 0000000..826db3d
--- /dev/null
+++ b/src/XMonad/Local/Keys.hs
@@ -0,0 +1,268 @@
+module XMonad.Local.Keys (
+      emacsKeys
+    , keyBindings
+    , modMask
+    ) where
+
+import Control.Monad
+import Data.Either.Utils
+import qualified Data.Map as M
+import Data.Maybe
+import qualified Network.MPD as MPD
+import qualified Network.MPD.Commands.Extensions as MPD
+import qualified XMonad as X
+import XMonad.Actions.CycleWS
+import qualified XMonad.Actions.DynamicWorkspaces as DW
+import qualified XMonad.Actions.DwmPromote as DwmP
+import XMonad.Actions.GridSelect
+import qualified XMonad.Actions.Submap as SUB
+import qualified XMonad.Actions.TopicSpace as TS
+import XMonad.Actions.Volume
+import qualified XMonad.Actions.WithAll as WithAll
+import XMonad.Hooks.ManageDocks
+import qualified XMonad.Layout.BoringWindows as BW
+import XMonad.Layout.Minimize
+import qualified XMonad.Layout.MultiToggle as MT
+import XMonad.Layout.Reflect
+import XMonad.Layout.SubLayouts
+import qualified XMonad.Layout.TopicDir as TD
+import XMonad.Layout.ToggleLayouts
+import XMonad.Layout.WindowNavigation
+import qualified XMonad.Prompt.Shell as Shell
+import qualified XMonad.Prompt.Ssh as PSsh
+import qualified XMonad.StackSet as W
+import qualified XMonad.Util.EZConfig as EZ
+import XMonad.Util.NamedScratchpad
+import XMonad.Util.WorkspaceCompare (getSortByIndex)
+
+-- local modules **************************************************************
+import qualified XMonad.Local.Actions as Local
+import XMonad.Local.Config
+import XMonad.Local.GridSelect as Local
+import XMonad.Local.NamedScratchpad
+import XMonad.Local.TopicSpace
+import XMonad.Local.Workspaces as Local
+
+modMask :: X.KeyMask
+modMask = X.mod4Mask
+modm :: String
+modm = "M4"
+
+keyBindings :: X.XConfig l -> M.Map (X.KeyMask, X.KeySym) (X.X())
+keyBindings conf = EZ.mkKeymap conf $ emacsKeys conf
+
+emacsKeys :: X.XConfig l -> [(String, X.X())]
+emacsKeys = \conf -> map prefix (emacsKeys' conf) ++ keys
+  where
+    prefix :: (String, a) -> (String, a)
+    prefix (k, a) = (modm ++ "-" ++ k, a)
+
+    emacsKeys' :: X.XConfig l -> [(String, X.X())]
+    emacsKeys' conf = [
+               -- Applications
+              (";", Local.spawnShell Nothing)
+            , ("S-;", Local.spawnExplorer)
+            , ("S-.", namedScratchpadAction namedScratchpads  "guake")
+            , ("p", Shell.shellPrompt xpConfig)
+            , ("S-p", Local.mateRun)
+
+              -- Layouts
+            , ("<Space>", X.sendMessage X.NextLayout)
+            , ("C-<Space>", SUB.submap $ EZ.mkKeymap conf $ concat
+                [ [(k, a), (modm ++ "-C-" ++ k, a)]
+                | (k, a) <- [ ("3", X.sendMessage (Toggle "ThreeCol"))
+                            , ("x", X.sendMessage (MT.Toggle REFLECTX))
+                            , ("y", X.sendMessage (MT.Toggle REFLECTY))
+                            ]
+                ])
+            , ("<F5>", X.refresh)
+            , ("C-j", X.sendMessage $ Go D)
+            , ("C-k", X.sendMessage $ Go U)
+            , ("C-h", X.sendMessage $ Go L)
+            , ("C-l", X.sendMessage $ Go R)
+            , ("j", BW.focusDown)
+            , ("k", BW.focusUp)
+            , ("m", X.windows W.focusMaster)
+            , ("S-j", X.windows W.swapDown)
+            , ("S-k", X.windows W.swapUp)
+            , ("C-.", onGroup W.focusUp')
+            , ("C-,", onGroup W.focusDown')
+            , ("h", X.sendMessage X.Shrink)
+            , ("l", X.sendMessage X.Expand)
+            , ("<Return>", X.windows W.focusMaster)
+            , ("S-<Return>", DwmP.dwmpromote)
+            , ("t", X.withFocused $ X.windows . W.sink)
+            , (",", X.sendMessage (X.IncMasterN 1))
+            , (".", X.sendMessage (X.IncMasterN (-1)))
+
+            -- keybindings for sublayouts
+            , ("g", SUB.submap $ defaultSublMap conf)
+            , ("<Left>", X.sendMessage $ pullGroup L)
+            , ("<Right>", X.sendMessage $ pullGroup R)
+            , ("<Up>", X.sendMessage $ pullGroup U)
+            , ("<Down>", X.sendMessage $ pullGroup D)
+            , ("C-m", X.withFocused (X.sendMessage . MergeAll))
+            , ("C-u", X.withFocused (X.sendMessage . UnMerge))
+
+            -- boring X.windows
+            , ("b", BW.markBoring)
+            , ("S-b", BW.clearBoring)
+
+            -- minimized widnows
+            , ("z", X.withFocused minimizeWindow)
+            , ("S-z", X.sendMessage RestoreNextMinimizedWin)
+
+              -- Toggle full screen
+            , ("<F12>", X.sendMessage ToggleStruts >> X.refresh)
+
+              -- Windows
+            , ("S-c", X.kill)
+            , ("C-S-c", WithAll.killAll)
+            , ("x", X.spawn "xkill")
+
+            -- Compositing
+            , ("S-x", SUB.submap $ EZ.mkKeymap conf $ concat
+                [ [(k, a), (modm ++ "-S-" ++ k, a)]
+                | (k, a) <- [ ("r", X.spawn "systemctl --user restart compositing")
+                            , ("s", X.spawn "systemctl --user stop compositing")]
+                ])
+
+              -- Workspaces
+            , ("<Tab>", Local.toggleWS)
+            , ("S-<Tab>", Local.toggleWSSwitch)
+            , ("C-<Right>", moveTo Next nonEmptyWs)
+            , ("]",         moveTo Next $ WSIs nonEmptyWsPred)
+            , ("C-<Left>",  moveTo Prev $ WSIs nonEmptyWsPred)
+            , ("[",         moveTo Prev $ WSIs nonEmptyWsPred)
+            , ("-", SUB.submap $ EZ.mkKeymap conf
+                [ (m ++ show k, _withNthWorkspace f i)
+                | (k, i) <- (zip ([1..9] ++ [0]) [10..] :: [(Int, Int)])
+                , (f, m) <- concat
+                    [ [ -- switch to ith workspace
+                        (W.greedyView, m)
+                        -- shift focused to ith workspace
+                      , (\ws -> W.greedyView ws . W.shift ws, m ++ "S-")
+                      ]
+                    | m <- ["", modm ++ "-"]
+                    ]
+                ])
+
+            , ("n", promptedNewWorkspace False)
+            , ("S-n", promptedNewWorkspace True)
+            , ("S-<Backspace>", WithAll.killAll >> DW.removeWorkspace)
+            , ("S-r", DW.renameWorkspace xpConfig)
+            , ("c", TD.changeDir xpConfig)
+
+            , ("r", swapScreens)
+
+            , ("a", TS.currentTopicAction topicConfig)
+
+            -- Grid Select workspace
+            , ("i", goToSelected Local.gsConfig)
+            , ("s", gsw)
+            , ("S-s", gswShift)
+
+              -- xmonad
+            , ("q", SUB.submap $ EZ.mkKeymap conf $ concat
+                [ [(k, a), (modm ++ "-" ++ k, a)]
+                | (k, a) <- [ ("c", X.spawn "xmonad --recompile; xmonad --restart")
+                            , ("r", X.spawn "xmonad --restart")
+                            , ("u", X.spawn "undock")
+                            , ("S-u", X.spawn "undock -s")
+                            , ("e", X.spawn "monitor-hotplug")
+                            , ("s", X.spawn "mate-session-save --shutdown-dialog")
+                            , ("q", X.spawn "mate-session-save --logout")
+                            , ("l", X.spawn "mate-screensaver-command --lock")
+                            ]
+                ])
+            , ("C-q", X.spawn "mate-screensaver-command --lock")
+
+            -- namedScratchpads
+            , ("C-S-t", namedScratchpadAction namedScratchpads "htop")
+            , ("C-S-a", namedScratchpadAction namedScratchpads "stardict")
+            , ("C-S-n", namedScratchpadAction namedScratchpads "notes")
+            , ("C-S-u", namedScratchpadAction namedScratchpads "charmap")
+            , ("C-S-l", namedScratchpadAction namedScratchpads "alarm")
+            , ("C-S-p", namedScratchpadAction namedScratchpads "volctl")
+
+            -- misc
+            , ("S-h", PSsh.sshPrompt xpConfig)
+            --, ("<Print>", X.spawn "xfce4-screenshooter")
+            , ("y", X.spawn "xfce4-popup-clipman")
+            , ("<Print>", X.spawn "mate-screenshot")
+            , ("C-<Print>", X.spawn "mate-screenshot -w")
+            , ("S-<Print>", X.spawn "mate-screenshot -a")
+
+            -- MPD
+            -- mov current playing song in mpd to thrash
+            , ("<Delete>", X.spawn "mpcrm")
+            , ("<XF86Forward>",
+                    X.io $ return . fromRight =<< MPD.withMPD MPD.next)
+            , ("<XF86Back>",
+                    X.io $ return . fromRight =<< MPD.withMPD MPD.previous)
+            ]
+         ++ [ (m ++ show i, _withNthWorkspace f ((i + 9) `mod` 10))
+            | i <- [1..9] ++ [0]
+            , (f, m) <- [ (W.greedyView, "") -- switch to ith workspace
+                          -- shift focused to ith workspace
+                        , (\ws -> W.greedyView ws . W.shift ws, "S-")
+                        ]
+            ]
+         ++ [ (m ++ k, X.screenWorkspace sc >>= flip X.whenJust (X.windows . f))
+            | (k, sc) <- zip ["w", "e"] [0..]
+            , (f, m)  <- [(W.view, ""), (W.shift, "S-")]
+            ]
+
+    -- no prefix
+    keys :: [(String, X.X())]
+    keys = [
+          ("<XF86Calculator>",
+             namedScratchpadAction namedScratchpads "calculator")
+        , ("<XF86Mail>", TS.switchTopic topicConfig "mail")
+        , ("<XF86Terminal>", Local.spawnShell Nothing)
+        , ("<XF86Explorer>", X.spawn "Terminal")
+        , ("<XF86HomePage>", TS.switchTopic topicConfig "web")
+
+        -- mpc
+        , ("<XF86AudioPlay>",
+                X.io $ return . fromRight =<< MPD.withMPD MPD.toggle)
+        , ("<XF86AudioStop>",
+                X.io $ return . fromRight =<< MPD.withMPD MPD.stop)
+        , ("<XF86AudioNext>",
+                X.io $ return . fromRight =<< MPD.withMPD MPD.next)
+        , ("<XF86AudioPrev>",
+                X.io $ return . fromRight =<< MPD.withMPD MPD.previous)
+
+        -- volume
+        , ("<XF86AudioMute>",        void toggleMute)
+        , ("<XF86AudioRaiseVolume>", void (raiseVolume 4))
+        , ("<XF86AudioLowerVolume>", void (lowerVolume 4))
+
+        -- brightness
+        , ("<XF86MonBrightnessUp>",     X.spawn "xbacklight +10")
+        , ("<XF86MonBrightnessDown>",   X.spawn "xbacklight -10")
+        , ("S-<XF86MonBrightnessUp>",   X.spawn "xbacklight +20")
+        , ("S-<XF86MonBrightnessDown>", X.spawn "xbacklight -20")
+        , ("C-<XF86MonBrightnessUp>",   X.spawn "xbacklight -set 100")
+        , ("C-<XF86MonBrightnessDown>", X.spawn "xbacklight -set 0")
+        ]
+
+    _withNthWorkspace :: (String -> X.WindowSet -> X.WindowSet) -> Int -> X.X ()
+    _withNthWorkspace job wnum = do
+        sortfunc <- getSortByIndex
+        ws <- X.gets ( map W.tag . sortfunc . namedScratchpadFilterOutWorkspace
+                   . W.workspaces . X.windowset )
+        case drop wnum ws of
+             (w:_) -> X.windows $ job w
+             [] -> return ()
+
+nonEmptyWsPred :: X.X (X.WindowSpace -> Bool)
+nonEmptyWsPred = do
+    let ne = isJust . W.stack
+    hs <- X.gets (map W.tag . W.hidden . X.windowset)
+    let hi w = W.tag w `elem` hs
+    return $ \w -> hi w && ne w && W.tag w /= "NSP"
+
+-- cykle only NonEmpty, Hidden workspaces and not NSP workspaces
+nonEmptyWs :: WSType
+nonEmptyWs = WSIs nonEmptyWsPred
diff --git a/src/XMonad/Local/NamedScratchpad.hs b/src/XMonad/Local/NamedScratchpad.hs
new file mode 100644
index 0000000..c89fd93
--- /dev/null
+++ b/src/XMonad/Local/NamedScratchpad.hs
@@ -0,0 +1,33 @@
+module XMonad.Local.NamedScratchpad (namedScratchpads) where
+
+import Data.String.Utils (startswith)
+import XMonad.ManageHook
+import qualified XMonad.StackSet as W
+import XMonad.Util.NamedScratchpad
+
+-- local modules **************************************************************
+import XMonad.Local.Config
+
+namedScratchpads :: [NamedScratchpad]
+namedScratchpads =
+        [ NS "htop" (terminal ++ " -t htop -e htop") (title =? "htop")
+            cTopFloat
+        , NS "stardict" "stardict" (className =? "Stardict") cFloating
+        , NS "notes" "gvim --role notes ~/notes.txt" (role =? "notes")
+            cFloating
+        , NS "charmap" "charmap" (className =? "Gucharmap") cFloating
+        , NS "alarm" "alarm-clock-applet"
+             (className =? "Alarm-clock-applet") cFloating
+        , NS "calculator" (terminal ++ " -e python --title PCalculator")
+                           (title =? "PCalculator") cFloating
+        , NS "volctl" "mate-volume-control" (className =? "Mate-volume-control") cFloating
+        , NS "guake" (terminal ++ " --window-with-profile=Guake-normal --tab-with-profile=Guake-root")
+             (className =? "Mate-terminal" <&&> (startsWith title "Guake")) cBottomFloat 
+        ]
+    where
+        role = stringProperty "WM_WINDOW_ROLE"
+        cFloating = customFloating $ W.RationalRect (1/3) (1/9) (1/3) (1/3)
+        cTopFloat = customFloating $ W.RationalRect (1/5) (1/32) (3/5) (1/2)
+        cBottomFloat = customFloating $ W.RationalRect (1/5) (5/8) (3/5) (3/8)
+        startsWith q x = fmap (startswith x) q
+
diff --git a/src/XMonad/Local/TopicSpace.hs b/src/XMonad/Local/TopicSpace.hs
index 93da894..e2ab5b0 100644
--- a/src/XMonad/Local/TopicSpace.hs
+++ b/src/XMonad/Local/TopicSpace.hs
@@ -1,16 +1,17 @@
 module XMonad.Local.TopicSpace (
       topicConfig
     , topicDirs
+    , workspaces
     ) where
 
 import qualified Data.Map as M
-import XMonad
+import qualified XMonad as X
 import qualified XMonad.Actions.TopicSpace as TS
 
 -- local modules **************************************************************
 import XMonad.Local.Actions
 
-topicDirs :: M.Map WorkspaceId String
+topicDirs :: M.Map X.WorkspaceId String
 topicDirs = M.fromList $
     [ ("dashboard"   , "~")
     , ("xmonad"      , "~/.xmonad")
@@ -45,21 +46,21 @@ topicConfig :: TS.TopicConfig
 topicConfig = TS.defaultTopicConfig
     { TS.topicDirs = topicDirs
     , TS.topicActions = M.fromList $
-        [ ("music", spawn "gmpc")
-        -- ("music", spawn $ myTerminal ++ " -depth 32 -bg rgba:0000/0000/0000/7777 -fg white -e ncmpcpp")
-        , ("mail", spawn "thunderbird")
-        , ("web", spawn "google-chrome")
-        , ("firefox", spawn "firefox")
-        , ("opera", spawn "opera")
-        , ("pdf", spawn "atril")
-        , ("chat", spawn "xchat" >> spawn "pidgin")
+        [ ("music", X.spawn "gmpc")
+        -- ("music", X.spawn $ myTerminal ++ " -depth 32 -bg rgba:0000/0000/0000/7777 -fg white -e ncmpcpp")
+        , ("mail", X.spawn "thunderbird")
+        , ("web", X.spawn "google-chrome")
+        , ("firefox", X.spawn "firefox")
+        , ("opera", X.spawn "opera")
+        , ("pdf", X.spawn "atril")
+        , ("chat", X.spawn "xchat" >> X.spawn "pidgin")
         , ("admin", spawnShell Nothing >> spawnShell Nothing)
-        , ("virt", spawn "virt-manager")
-        , ("vbox", spawn "VirtualBox")
-        , ("gimp", spawn "gimp")
-        , ("eclipse", spawn "eclipse")
-        , ("ebook", spawn "calibre")
-        , ("video", spawn "vlc")
+        , ("virt", X.spawn "virt-manager")
+        , ("vbox", X.spawn "VirtualBox")
+        , ("gimp", X.spawn "gimp")
+        , ("eclipse", X.spawn "eclipse")
+        , ("ebook", X.spawn "calibre")
+        , ("video", X.spawn "vlc")
         , ("xmonad", spawnShell (Just "vim -S xmonad.vim") >>
               spawnShell Nothing)
         , ("remote", spawnShell Nothing >> spawnShell Nothing)
@@ -68,8 +69,8 @@ topicConfig = TS.defaultTopicConfig
         , ("providers", spawnShell Nothing >> spawnShell Nothing)
         , ("cim", spawnShell Nothing >>
               spawnShellIn "/usr/lib/python2.7/site-packages/pywbem" Nothing)
-        , ("bank", spawn "google-chrome https://www.mojebanka.cz/InternetBanking/")
-        , ("p2p", spawn "deluge-gtk")
+        , ("bank", X.spawn "google-chrome https://www.mojebanka.cz/InternetBanking/")
+        , ("p2p", X.spawn "deluge-gtk")
         , ("hwdata",
               spawnShell Nothing >>
               spawnShellIn "~/fedora-scm/hwdata" Nothing >>
@@ -82,12 +83,15 @@ topicConfig = TS.defaultTopicConfig
         , ("distribution", spawnShell Nothing >> spawnShell Nothing >>
                 spawnShellIn "~/workspace/go/distribution" (Just "bash --rcfile .bashrc"))
         , ("scripts", spawnShell Nothing >> spawnShell Nothing)
-        , ("ciV", spawn "launch-ciV.sh -m -b")
-        , ("scrum", spawn "firefox https://bluejeans.com/3046463974/")
-        , ("BG", spawn "steam steam://rungameid/228280" >>
-              spawn "firefox http://slovnik.seznam.cz/de-cz/")
+        , ("ciV", X.spawn "launch-ciV.sh -m -b")
+        , ("scrum", X.spawn "firefox https://bluejeans.com/3046463974/")
+        , ("BG", X.spawn "steam steam://rungameid/228280" >>
+              X.spawn "firefox http://slovnik.seznam.cz/de-cz/")
         ] ++ map (\w -> (w, spawnShell Nothing >> spawnShell Nothing))
         [ "ae", "aet", "aes", "aea" ]
     , TS.defaultTopicAction = const $ return ()
     , TS.defaultTopic = "dashboard"
     }
+
+workspaces :: [X.WorkspaceId]
+workspaces = ["dashboard", "devel"]
diff --git a/src/XMonad/Local/Workspaces.hs b/src/XMonad/Local/Workspaces.hs
new file mode 100644
index 0000000..eed5fda
--- /dev/null
+++ b/src/XMonad/Local/Workspaces.hs
@@ -0,0 +1,91 @@
+{-# LANGUAGE DoAndIfThenElse #-}
+
+module XMonad.Local.Workspaces (
+      newWorkspace
+    , newWorkspaceDir
+    , promptedNewWorkspace
+    , swapScreens
+    , toggleWS
+    , toggleWSSwitch
+    ) where
+
+import Control.Monad
+import Data.Maybe
+import qualified Data.Map as M
+import qualified Data.Set as S
+import XMonad
+import qualified XMonad.Actions.CycleWS as WS
+import qualified XMonad.Actions.DynamicWorkspaces as DW
+import qualified XMonad.Actions.TopicSpace as TS
+import qualified XMonad.Layout.TopicDir as TD
+import qualified XMonad.Prompt.Input as PI
+import qualified XMonad.StackSet as W
+
+-- local modules **************************************************************
+import qualified XMonad.Local.Config as Local
+import qualified XMonad.Local.TopicSpace as Local
+
+-- workspace creation *********************************************************
+promptedNewWorkspace :: Bool -> X()
+promptedNewWorkspace shiftFocused = PI.inputPrompt Local.xpConfig "New Workspace"
+                                  PI.?+ action shiftFocused
+  where
+    action :: Bool -> String -> X()
+    action True = newWorkspaceDir shiftto
+    action _    = newWorkspaceDir goto
+
+newWorkspace :: WorkspaceId -> X()
+newWorkspace w = do
+    exists <- widExists w
+    unless exists $ DW.addHiddenWorkspace w
+
+newWorkspaceDir :: (TS.Topic -> X()) -> WorkspaceId -> X()
+newWorkspaceDir gotofunc w = do
+    exists <- widExists w
+    if not exists then do
+        DW.addHiddenWorkspace w
+        gotofunc w
+        unless (w `S.member` doNotAskForDir) $ TD.changeDir Local.xpConfig
+    else
+        gotofunc w
+  where
+    doNotAskForDir :: S.Set WorkspaceId
+    doNotAskForDir = S.fromList $
+         ["mail", "chat", "virt", "vbox", "web"] ++ M.keys Local.topicDirs
+
+widExists :: WorkspaceId -> X Bool
+widExists wid = do
+    xs <- get
+    return $ widExists' wid (windowset xs)
+  where
+    widExists' :: WorkspaceId -> W.StackSet WorkspaceId l a s sd -> Bool
+    widExists' w ws = w `elem` map W.tag (W.workspaces ws)
+
+-- workspace switching ********************************************************
+toggleWS :: X()
+toggleWS = do
+    hs' <- cleanHiddens ["NSP"]
+    unless (null hs') (windows . W.greedyView . W.tag $ head hs')
+  where
+    cleanHiddens :: [WorkspaceId] -> X [WindowSpace]
+    cleanHiddens skips = gets $ flip WS.skipTags skips . W.hidden . windowset
+
+toggleWSSwitch :: X()
+toggleWSSwitch = do
+    hs' <- cleanHiddens []
+    unless (null hs') (windows . (\ws -> W.greedyView ws . W.shift ws) . W.tag $ head hs')
+  where
+    cleanHiddens :: [WorkspaceId] -> X [WindowSpace]
+    cleanHiddens skips =  gets $ flip WS.skipTags skips . W.hidden . windowset
+
+-- creates the workspace if needed
+goto :: TS.Topic -> X()
+goto t = newWorkspace t >> TS.switchTopic Local.topicConfig t
+shiftto :: TS.Topic -> X()
+shiftto t = newWorkspace t >> windows (W.greedyView t . W.shift t)
+
+-- swap workspaces between screens
+swapScreens :: X ()
+swapScreens = do
+    screen <- gets (listToMaybe . W.visible . windowset)
+    whenJust screen $ windows . W.greedyView . W.tag . W.workspace
diff --git a/xminad.cabal b/xminad.cabal
index 9396ad5..6023db8 100644
--- a/xminad.cabal
+++ b/xminad.cabal
@@ -13,8 +13,13 @@ Library
     Exposed-Modules: 
         XMonad.Layout.TopicDir
         XMonad.Local.Actions
+        XMonad.Local.Config
+        XMonad.Local.GridSelect
+        XMonad.Local.Keys
         XMonad.Local.Layout
+        XMonad.Local.NamedScratchpad
         XMonad.Local.TopicSpace
+        XMonad.Local.Workspaces
 
     HS-Source-Dirs: src
     GHC-Options: -Wall -Werror
@@ -26,14 +31,15 @@ Library
        -- , cairo          >= 0.13 && < 0.14
        , containers
        , directory      >= 1.1  && < 1.3
+       , MissingH       >= 1.0  && < 1.3
        --, filepath       >= 1.3  && < 1.4
-       --, libmpd         >= 0.8  && < 1.0
+       , libmpd         >= 0.8  && < 1.0
        --, parsec         >= 3.1  && < 3.2
        --, regex-compat   >= 0.90 && < 1.0
        --, text           >= 0.11 && < 1.3
        , xmonad         >= 0.11 && < 0.12
        , xmonad-contrib >= 0.11
-       --, xmonad-extras  >= 0.11 && < 0.12
+       , xmonad-extras  >= 0.11 && < 0.12
 
 Executable xminad
     Main-Is: xminad.hs
diff --git a/xminad.hs b/xminad.hs
index de4ce67..81d43e3 100644
--- a/xminad.hs
+++ b/xminad.hs
@@ -1,37 +1,22 @@
-{-# LANGUAGE NoMonomorphismRestriction, DoAndIfThenElse #-}
+{-# LANGUAGE NoMonomorphismRestriction #-}
 {-# OPTIONS -fno-warn-missing-signatures #-}
 
 import qualified Codec.Binary.UTF8.String as UTF8
 --import Control.Exception
-import Control.Monad
-import Data.Either.Utils
 import qualified Data.Map as M
 import Data.List
-import Data.Maybe
 import Data.Monoid
-import Data.String.Utils (startswith)
-import qualified Data.Set as S
 import qualified DBus as D
 import qualified DBus.Client as D
-import qualified Network.MPD as MPD
-import qualified Network.MPD.Commands.Extensions as MPD
 import Text.Regex
 import Text.Regex.Posix
 --import System.Exit
 --import System.IO
 
 import XMonad
-import XMonad.Actions.CycleWS
-import XMonad.Actions.GridSelect as GS
-import XMonad.Actions.Volume
 --import XMonad.Actions.UpdateFocus
-import qualified XMonad.Actions.DwmPromote as DwmP
-import qualified XMonad.Actions.DynamicWorkspaces as DW
 import qualified XMonad.Actions.FlexibleResize as FlexR
-import qualified XMonad.Actions.Submap as SUB
-import qualified XMonad.Actions.TopicSpace as TS
 import qualified XMonad.Actions.UpdatePointer as UP
-import qualified XMonad.Actions.WithAll as WithAll
 import XMonad.Config.Desktop
 import XMonad.Hooks.CurrentWorkspaceOnTop
 import XMonad.Hooks.DynamicLog as DL
@@ -41,17 +26,6 @@ import XMonad.Hooks.SetWMName
 import XMonad.Hooks.UrgencyHook
 import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.ManageHelpers
-import qualified XMonad.Layout.BoringWindows as BW
-import XMonad.Layout.Minimize
-import qualified XMonad.Layout.MultiToggle as MT
-import XMonad.Layout.Reflect
-import XMonad.Layout.SubLayouts
-import XMonad.Layout.ToggleLayouts
-import XMonad.Layout.WindowNavigation
-import qualified XMonad.Prompt as P
-import qualified XMonad.Prompt.Shell as Shell
-import qualified XMonad.Prompt.Input as PI
-import qualified XMonad.Prompt.Ssh as PSsh
 import qualified XMonad.StackSet as W
 import qualified XMonad.Util.EZConfig as EZ
 import XMonad.Util.NamedScratchpad as NS
@@ -59,17 +33,12 @@ import XMonad.Util.NamedScratchpad as NS
 import XMonad.Util.WorkspaceCompare (getSortByIndex)
 
 -- local modules **************************************************************
-import qualified XMonad.Layout.TopicDir as TD
-import qualified XMonad.Local.Actions as Local
+import qualified XMonad.Local.Config as Local
+import qualified XMonad.Local.Keys as Local
 import qualified XMonad.Local.Layout as Local
+import qualified XMonad.Local.NamedScratchpad as Local
 import qualified XMonad.Local.TopicSpace as Local
-
-myModMask :: KeyMask
-myModMask = mod4Mask
-modm :: String
-modm = "M4"
-myTerminal :: String
-myTerminal = "mate-terminal"
+import qualified XMonad.Local.Workspaces as Local
 
 doNotFadeOutWindows :: Query Bool
 doNotFadeOutWindows =
@@ -89,407 +58,8 @@ doNotFadeOutWindows =
     className =? "BaldursGate" <||>
     title     =? "VLC (XVideo output)"
 
-myNamedScratchpads :: [NamedScratchpad]
-myNamedScratchpads =
-        [ NS "htop" (myTerminal ++ " -t htop -e htop") (title =? "htop")
-            cTopFloat
-        , NS "stardict" "stardict" (className =? "Stardict") cFloating
-        , NS "notes" "gvim --role notes ~/notes.txt" (role =? "notes")
-            cFloating
-        , NS "charmap" "charmap" (className =? "Gucharmap") cFloating
-        , NS "alarm" "alarm-clock-applet"
-             (className =? "Alarm-clock-applet") cFloating
-        , NS "calculator" (myTerminal ++ " -e python --title PCalculator")
-                           (title =? "PCalculator") cFloating
-        , NS "volctl" "mate-volume-control" (className =? "Mate-volume-control") cFloating
-        , NS "guake" (myTerminal ++ " --window-with-profile=Guake-normal --tab-with-profile=Guake-root")
-             (className =? "Mate-terminal" <&&> (startsWith title "Guake")) cBottomFloat 
-        ]
-    where
-        role = stringProperty "WM_WINDOW_ROLE"
-        cFloating = customFloating $ W.RationalRect (1/3) (1/9) (1/3) (1/3)
-        cTopFloat = customFloating $ W.RationalRect (1/5) (1/32) (3/5) (1/2)
-        cBottomFloat = customFloating $ W.RationalRect (1/5) (5/8) (3/5) (3/8)
-        startsWith q x = fmap (startswith x) q
-
-myXPConfig :: P.XPConfig
-myXPConfig = P.defaultXPConfig
-    { P.fgColor = "#dfdfdf"
-    , P.bgColor = "#3c3c3c"
-    , P.fgHLight = "#ffffff"
-    , P.bgHLight = "#3c3c3c"
-    , P.font    = "-*-terminus-*-*-*-*-14-*-*-*-*-*-*-*"
-    , P.height  = 24
-    }
-
-myWorkspaces :: [WorkspaceId]
-myWorkspaces = ["dashboard", "devel"]
-
-myGSConfig :: HasColorizer a => GSConfig a
-myGSConfig = GS.defaultGSConfig
-    { gs_cellheight = 40
-    , gs_cellwidth = 100
-    , gs_navigate = navigation'
-    }
-  where
-    navigation' :: TwoD a (Maybe a)
-    navigation' = GS.makeXEventhandler
-                $ GS.shadowWithKeymap navKeyMap navHandler
-
-    navKeyMap = M.fromList (allowModifs modifs
-          [ ((0,xK_Escape)     , cancel)
-          , ((0,xK_Return)     , select)
-          , ((0,xK_slash)      , substringSearch navigation')
-          , ((0,xK_question)   , substringSearch navigation')
-          , ((0,xK_Left)       , move (-1,0) >> navigation')
-          , ((0,xK_h)          , move (-1,0) >> navigation')
-          , ((0,xK_H)          , move (-1,0) >> navigation')
-          , ((0,xK_Right)      , move (1,0) >> navigation')
-          , ((0,xK_l)          , move (1,0) >> navigation')
-          , ((0,xK_L)          , move (1,0) >> navigation')
-          , ((0,xK_Down)       , move (0,1) >> navigation')
-          , ((0,xK_j)          , move (0,1) >> navigation')
-          , ((0,xK_J)          , move (0,1) >> navigation')
-          , ((0,xK_Up)         , move (0,-1) >> navigation')
-          , ((0,xK_k)          , move (0,-1) >> navigation')
-          , ((0,xK_K)          , move (0,-1) >> navigation')
-          , ((0,xK_n)          , moveNext >> navigation')
-          , ((0,xK_N)          , moveNext >> navigation')
-          , ((0,xK_p)          , movePrev >> navigation')
-          , ((0,xK_P)          , movePrev >> navigation')
-          ]
-        ++ allowModifs (drop 1 modifs)
-          [ ((0,xK_Tab)         , moveNext >> navigation')
-          , ((shiftMask,xK_Tab) , moveNext >> navigation')
-          ]
-        )
-    modifs :: [KeyMask]
-    modifs = [ shiftMask, lockMask, mod1Mask, mod2Mask
-             , mod3Mask, mod4Mask, mod5Mask ]
-
-    allowModifs :: [ KeyMask ] -> [((KeyMask, a), b)] -> [((KeyMask, a), b)]
-    allowModifs mods keymap = [ ((m .|. o, k), a)
-            | m <- map (foldl (.|.) 0) $ subsequences mods
-            , ((o, k), a) <- keymap ]
-
-    -- The navigation handler ignores unknown key symbols
-    navHandler = const navigation'
-
-nonEmptyWsPred :: X (WindowSpace -> Bool)
-nonEmptyWsPred = do
-    let ne = isJust . W.stack
-    hs <- gets (map W.tag . W.hidden . windowset)
-    let hi w = W.tag w `elem` hs
-    return $ \w -> hi w && ne w && W.tag w /= "NSP"
-
-swapScreens :: X ()
-swapScreens = do
-    screen <- gets (listToMaybe . W.visible . windowset)
-    whenJust screen $ windows . W.greedyView . W.tag . W.workspace
-
-{- cykle only NonEmpty, Hidden workspaces and not NSP workspaces -}
-nonEmptyWs :: WSType
-nonEmptyWs = WSIs nonEmptyWsPred
-
-myKeys :: XConfig l -> M.Map (KeyMask, KeySym) (X())
-myKeys conf = EZ.mkKeymap conf $ emacsKeys conf
-
-emacsKeys :: XConfig l -> [(String, X())]
-emacsKeys = \conf -> map prefix (emacsKeys' conf) ++ keys'
-  where
-    prefix :: (String, a) -> (String, a)
-    prefix (k, a) = (modm ++ "-" ++ k, a)
-
-    emacsKeys' :: XConfig l -> [(String, X())]
-    emacsKeys' conf = [
-               -- Applications
-              (";", Local.spawnShell Nothing)
-            , ("S-;", Local.spawnExplorer)
-            , ("S-.", namedScratchpadAction myNamedScratchpads  "guake")
-            , ("p", Shell.shellPrompt myXPConfig)
-            , ("S-p", mateRun)
-
-              -- Layouts
-            , ("<Space>", sendMessage NextLayout)
-            , ("C-<Space>", SUB.submap $ EZ.mkKeymap conf $ concat
-                [ [(k, a), (modm ++ "-C-" ++ k, a)]
-                | (k, a) <- [ ("3", sendMessage (Toggle "ThreeCol"))
-                            , ("x", sendMessage (MT.Toggle REFLECTX))
-                            , ("y", sendMessage (MT.Toggle REFLECTY))
-                            ]
-                ])
-            , ("<F5>", refresh)
-            , ("C-j", sendMessage $ Go D)
-            , ("C-k", sendMessage $ Go U)
-            , ("C-h", sendMessage $ Go L)
-            , ("C-l", sendMessage $ Go R)
-            , ("j", BW.focusDown)
-            , ("k", BW.focusUp)
-            , ("m", windows W.focusMaster)
-            , ("S-j", windows W.swapDown)
-            , ("S-k", windows W.swapUp)
-            , ("C-.", onGroup W.focusUp')
-            , ("C-,", onGroup W.focusDown')
-            , ("h", sendMessage Shrink)
-            , ("l", sendMessage Expand)
-            , ("<Return>", windows W.focusMaster)
-            , ("S-<Return>", DwmP.dwmpromote)
-            , ("t", withFocused $ windows . W.sink)
-            , (",", sendMessage (IncMasterN 1))
-            , (".", sendMessage (IncMasterN (-1)))
-
-            -- keybindings for sublayouts
-            , ("g", SUB.submap $ defaultSublMap conf)
-            , ("<Left>", sendMessage $ pullGroup L)
-            , ("<Right>", sendMessage $ pullGroup R)
-            , ("<Up>", sendMessage $ pullGroup U)
-            , ("<Down>", sendMessage $ pullGroup D)
-            , ("C-m", withFocused (sendMessage . MergeAll))
-            , ("C-u", withFocused (sendMessage . UnMerge))
-
-            -- boring windows
-            , ("b", BW.markBoring)
-            , ("S-b", BW.clearBoring)
-
-            -- minimized widnows
-            , ("z", withFocused minimizeWindow)
-            , ("S-z", sendMessage RestoreNextMinimizedWin)
-
-              -- Toggle full screen
-            , ("<F12>", sendMessage ToggleStruts >> refresh)
-
-              -- Windows
-            , ("S-c", kill)
-            , ("C-S-c", WithAll.killAll)
-            , ("x", spawn "xkill")
-
-            -- Compositing
-            , ("S-x", SUB.submap $ EZ.mkKeymap conf $ concat
-                [ [(k, a), (modm ++ "-S-" ++ k, a)]
-                | (k, a) <- [ ("r", spawn "systemctl --user restart compositing")
-                            , ("s", spawn "systemctl --user stop compositing")]
-                ])
-
-              -- Workspaces
-            , ("<Tab>", myToggleWS)
-            , ("S-<Tab>", toggleWSSwitch)
-            , ("C-<Right>", moveTo Next nonEmptyWs)
-            , ("]",         moveTo Next $ WSIs nonEmptyWsPred)
-            , ("C-<Left>",  moveTo Prev $ WSIs nonEmptyWsPred)
-            , ("[",         moveTo Prev $ WSIs nonEmptyWsPred)
-            , ("-", SUB.submap $ EZ.mkKeymap conf
-                [ (m ++ show k, _withNthWorkspace f i)
-                | (k, i) <- (zip ([1..9] ++ [0]) [10..] :: [(Int, Int)])
-                , (f, m) <- concat
-                    [ [ -- switch to ith workspace
-                        (W.greedyView, m)
-                        -- shift focused to ith workspace
-                      , (\ws -> W.greedyView ws . W.shift ws, m ++ "S-")
-                      ]
-                    | m <- ["", modm ++ "-"]
-                    ]
-                ])
-
-            , ("n", promptedNewWorkspace False)
-            , ("S-n", promptedNewWorkspace True)
-            , ("S-<Backspace>", WithAll.killAll >> DW.removeWorkspace)
-            , ("S-r", DW.renameWorkspace myXPConfig)
-            , ("c", TD.changeDir myXPConfig)
-
-            , ("r", swapScreens)
-
-            , ("a", TS.currentTopicAction Local.topicConfig)
-
-            -- Grid Select workspace
-            , ("i", goToSelected myGSConfig)
-            , ("s", gsw)
-            , ("S-s", gswShift)
-
-              -- xmonad
-            , ("q", SUB.submap $ EZ.mkKeymap conf $ concat
-                [ [(k, a), (modm ++ "-" ++ k, a)]
-                | (k, a) <- [ ("c", spawn "xmonad --recompile; xmonad --restart")
-                            , ("r", spawn "xmonad --restart")
-                            , ("u", spawn "undock")
-                            , ("S-u", spawn "undock -s")
-                            , ("e", spawn "monitor-hotplug")
-                            , ("s", spawn "mate-session-save --shutdown-dialog")
-                            , ("q", spawn "mate-session-save --logout")
-                            , ("l", spawn "mate-screensaver-command --lock")
-                            ]
-                ])
-            , ("C-q", spawn "mate-screensaver-command --lock")
-
-            -- myNamedScratchpads
-            , ("C-S-t", namedScratchpadAction myNamedScratchpads "htop")
-            , ("C-S-a", namedScratchpadAction myNamedScratchpads "stardict")
-            , ("C-S-n", namedScratchpadAction myNamedScratchpads "notes")
-            , ("C-S-u", namedScratchpadAction myNamedScratchpads "charmap")
-            , ("C-S-l", namedScratchpadAction myNamedScratchpads "alarm")
-            , ("C-S-p", namedScratchpadAction myNamedScratchpads "volctl")
-
-            -- misc
-            , ("S-h", PSsh.sshPrompt myXPConfig)
-            --, ("<Print>", spawn "xfce4-screenshooter")
-            , ("y", spawn "xfce4-popup-clipman")
-            , ("<Print>", spawn "mate-screenshot")
-            , ("C-<Print>", spawn "mate-screenshot -w")
-            , ("S-<Print>", spawn "mate-screenshot -a")
-
-            -- MPD
-            -- mov current playing song in mpd to thrash
-            , ("<Delete>", spawn "mpcrm")
-            , ("<XF86Forward>",
-                    io $ return . fromRight =<< MPD.withMPD MPD.next)
-            , ("<XF86Back>",
-                    io $ return . fromRight =<< MPD.withMPD MPD.previous)
-            ]
-         ++ [ (m ++ show i, _withNthWorkspace f ((i + 9) `mod` 10))
-            | i <- [1..9] ++ [0]
-            , (f, m) <- [ (W.greedyView, "") -- switch to ith workspace
-                          -- shift focused to ith workspace
-                        , (\ws -> W.greedyView ws . W.shift ws, "S-")
-                        ]
-            ]
-         ++ [ (m ++ k, screenWorkspace sc >>= flip whenJust (windows . f))
-            | (k, sc) <- zip ["w", "e"] [0..]
-            , (f, m)  <- [(W.view, ""), (W.shift, "S-")]
-            ]
-
-    -- no prefix
-    keys' :: [(String, X())]
-    keys' = [
-          ("<XF86Calculator>",
-             namedScratchpadAction myNamedScratchpads "calculator")
-        , ("<XF86Mail>", TS.switchTopic Local.topicConfig "mail")
-        , ("<XF86Terminal>", Local.spawnShell Nothing)
-        , ("<XF86Explorer>", spawn "Terminal")
-        , ("<XF86HomePage>", TS.switchTopic Local.topicConfig "web")
-
-        -- mpc
-        , ("<XF86AudioPlay>",
-                io $ return . fromRight =<< MPD.withMPD MPD.toggle)
-        , ("<XF86AudioStop>",
-                io $ return . fromRight =<< MPD.withMPD MPD.stop)
-        , ("<XF86AudioNext>",
-                io $ return . fromRight =<< MPD.withMPD MPD.next)
-        , ("<XF86AudioPrev>",
-                io $ return . fromRight =<< MPD.withMPD MPD.previous)
-
-        -- volume
-        , ("<XF86AudioMute>",        void toggleMute)
-        , ("<XF86AudioRaiseVolume>", void (raiseVolume 4))
-        , ("<XF86AudioLowerVolume>", void (lowerVolume 4))
-
-        -- brightness
-        , ("<XF86MonBrightnessUp>",     spawn "xbacklight +10")
-        , ("<XF86MonBrightnessDown>",   spawn "xbacklight -10")
-        , ("S-<XF86MonBrightnessUp>",   spawn "xbacklight +20")
-        , ("S-<XF86MonBrightnessDown>", spawn "xbacklight -20")
-        , ("C-<XF86MonBrightnessUp>",   spawn "xbacklight -set 100")
-        , ("C-<XF86MonBrightnessDown>", spawn "xbacklight -set 0")
-        ]
-
-    _withNthWorkspace :: (String -> WindowSet -> WindowSet) -> Int -> X ()
-    _withNthWorkspace job wnum = do
-        sortfunc <- getSortByIndex
-        ws <- gets ( map W.tag . sortfunc . namedScratchpadFilterOutWorkspace
-                   . W.workspaces . windowset )
-        case drop wnum ws of
-             (w:_) -> windows $ job w
-             [] -> return ()
-
-
-myToggleWS :: X()
-myToggleWS = do
-    hs' <- cleanHiddens ["NSP"]
-    unless (null hs') (windows . W.greedyView . W.tag $ head hs')
-  where
-    cleanHiddens :: [WorkspaceId] -> X [WindowSpace]
-    cleanHiddens skips = gets $ flip skipTags skips . W.hidden . windowset
-
-toggleWSSwitch :: X()
-toggleWSSwitch = do
-    hs' <- cleanHiddens []
-    unless (null hs') (windows . (\ws -> W.greedyView ws . W.shift ws) . W.tag $ head hs')
-  where
-    cleanHiddens :: [WorkspaceId] -> X [WindowSpace]
-    cleanHiddens skips =  gets $ flip skipTags skips . W.hidden . windowset
-
-promptedNewWorkspace :: Bool -> X()
-promptedNewWorkspace shiftFocused = PI.inputPrompt myXPConfig "New Workspace"
-                                  PI.?+ action shiftFocused
-  where
-    action :: Bool -> String -> X()
-    action True = newWorkspaceDir shiftto
-    action _    = newWorkspaceDir goto
-
--- creates the workspace if needed
-goto :: TS.Topic -> X()
-goto t = newWorkspace t >> TS.switchTopic Local.topicConfig t
-shiftto :: TS.Topic -> X()
-shiftto t = newWorkspace t >> windows (W.greedyView t . W.shift t)
-
-newWorkspace :: WorkspaceId -> X()
-newWorkspace w = do
-    exists <- widExists w
-    unless exists $ DW.addHiddenWorkspace w
-
-newWorkspaceDir :: (TS.Topic -> X()) -> WorkspaceId -> X()
-newWorkspaceDir gotofunc w = do
-    exists <- widExists w
-    if not exists then do
-        DW.addHiddenWorkspace w
-        gotofunc w
-        unless (w `S.member` doNotAskForDir) $ TD.changeDir myXPConfig
-    else
-        gotofunc w
-  where
-    doNotAskForDir :: S.Set WorkspaceId
-    doNotAskForDir = S.fromList $
-         ["mail", "chat", "virt", "vbox", "web"] ++ M.keys Local.topicDirs
-
-widExists :: WorkspaceId -> X Bool
-widExists wid = do
-    xs <- get
-    return $ widExists' wid (windowset xs)
-  where
-    widExists' :: WorkspaceId -> W.StackSet WorkspaceId l a s sd -> Bool
-    widExists' w ws = w `elem` map W.tag (W.workspaces ws)
-
-switchTopic' :: (WorkspaceId -> WindowSet -> WindowSet)
-                -> TS.Topic -> X ()
-switchTopic' viewMethod topic = do
-   windows $ viewMethod topic
-   wins <- gets (W.integrate' . W.stack . W.workspace . W.current . windowset)
-   when (null wins) $ TS.topicAction Local.topicConfig topic
-
-gsw :: X()
-gsw = gsw' W.greedyView
-  where
-    gsw' :: (WorkspaceId -> WindowSet -> WindowSet) -> X ()
-    gsw' viewFunc = withWindowSet $ \ws -> do
-        let wss = map W.tag $ fHidden ws ++ map W.workspace (W.current ws : W.visible ws)
-        gridselect myGSConfig (zip wss wss) >>= flip whenJust (switchTopic' viewFunc)
-    fHidden = filter ((/=) "NSP" . W.tag) . W.hidden
-
-gswShift :: X()
-gswShift = gridselectWorkspace myGSConfig (\ws -> W.greedyView ws . W.shift ws)
-
-mateRun :: X ()
-mateRun = withDisplay $ \dpy -> do
-    rw <- asks theRoot
-    mate_panel <- getAtom "_MATE_PANEL_ACTION"
-    panel_run   <- getAtom "_MATE_PANEL_ACTION_RUN_DIALOG"
-
-    io $ allocaXEvent $ \e -> do
-        setEventType e clientMessage
-        setClientMessageEvent e rw mate_panel 32 panel_run 0
-        sendEvent dpy rw False structureNotifyMask e
-        sync dpy False
-
 myBaseConfig = desktopConfig
-    { XMonad.modMask = myModMask
+    { XMonad.modMask = Local.modMask
     }
 
 -- Mouse bindings: default actions bound to mouse events
@@ -535,7 +105,7 @@ myManageHook = composeOne (concat
         , [className =? c -?> doMaster <+> doFloat | c <- myCFloats ]
         , [title =? t -?> doMaster <+> doFloat | t <- myTFloats ]
         , [ className =? "BaldursGate" -?> doMyShift "BG" <+> doMaster]
-        , [query c -?> hook c | c <- myNamedScratchpads]])
+        , [query c -?> hook c | c <- Local.namedScratchpads]])
         --, [className =? "dzen" -?> transparency 0.4]])
     <+>
     composeOne (concat
@@ -563,7 +133,7 @@ myManageHook = composeOne (concat
     doMaster = doF W.shiftMaster
     doMyShift :: WorkspaceId -> ManageHook
     doMyShift wsp = do
-        liftX (newWorkspace wsp)
+        liftX (Local.newWorkspace wsp)
         doF $ W.greedyView wsp . W.shift wsp
     myTFloats = [ "VLC (XVideo output)"
               , "DownThemAll! - Make Your Selection"
@@ -734,14 +304,14 @@ myEventHook = mconcat
     ]
 
 myConfig dbus = myBaseConfig
-    { modMask = myModMask
+    { modMask = Local.modMask
     , borderWidth = 1
     , normalBorderColor = "#FFD12B"
     , focusedBorderColor = "#FF511F"
-    , terminal = myTerminal
-    , workspaces = myWorkspaces
+    , terminal = Local.terminal
+    , workspaces = Local.workspaces
     , layoutHook = desktopLayoutModifiers Local.layoutHook
-    , keys = myKeys
+    , keys = Local.keyBindings
     , logHook = myLogHook dbus
     , handleEventHook = myEventHook
     , manageHook = myManageHook
@@ -751,7 +321,7 @@ myConfig dbus = myBaseConfig
   where
     mc = myConfig dbus
     myStartupHook = do
-        return () >> EZ.checkKeymap mc (emacsKeys mc)
+        return () >> EZ.checkKeymap mc (Local.emacsKeys mc)
         startupHook myBaseConfig
         -- adjustEventInput
         setWMName "LG3D"