From 1b65350fc6ae21f430fe90060bd154fb06fad3c1 Mon Sep 17 00:00:00 2001
From: Michal Minar <miminar@redhat.com>
Date: Sun, 2 Aug 2015 15:00:38 +0200
Subject: Styling fixes

Signed-off-by: Michal Minar <miminar@redhat.com>
---
 src/XMonad/Local/GridSelect.hs | 52 ++++++++++++++++++++++--------------------
 src/XMonad/Local/Keys.hs       | 18 +++++++--------
 2 files changed, 36 insertions(+), 34 deletions(-)

(limited to 'src/XMonad')

diff --git a/src/XMonad/Local/GridSelect.hs b/src/XMonad/Local/GridSelect.hs
index 359cda5..20dde76 100644
--- a/src/XMonad/Local/GridSelect.hs
+++ b/src/XMonad/Local/GridSelect.hs
@@ -28,30 +28,30 @@ gsConfig = defaultGSConfig
                 $ 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')
+          [ ((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')
+          [ ((0, xK_Tab)        , moveNext >> navigation')
+          , ((shiftMask, xK_Tab), moveNext >> navigation')
           ]
         )
     modifs :: [KeyMask]
@@ -59,9 +59,11 @@ gsConfig = defaultGSConfig
              , 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 ]
+    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'
diff --git a/src/XMonad/Local/Keys.hs b/src/XMonad/Local/Keys.hs
index 8f94bdd..eedd708 100644
--- a/src/XMonad/Local/Keys.hs
+++ b/src/XMonad/Local/Keys.hs
@@ -14,7 +14,7 @@ import XMonad hiding (modMask, keys)
 import XMonad.Actions.CycleWS
 import qualified XMonad.Actions.DynamicWorkspaces as DW
 import qualified XMonad.Actions.DwmPromote as DwmP
-import XMonad.Actions.GridSelect
+import XMonad.Actions.GridSelect as GS
 import qualified XMonad.Actions.Submap as SUB
 import qualified XMonad.Actions.TopicSpace as TS
 import XMonad.Actions.Volume
@@ -38,10 +38,10 @@ 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 qualified XMonad.Local.GridSelect as Local
 import XMonad.Local.NamedScratchpad
 import XMonad.Local.TopicSpace
-import XMonad.Local.Workspaces as Local
+import qualified XMonad.Local.Workspaces as Local
 
 modMask :: KeyMask
 modMask = mod4Mask
@@ -150,20 +150,20 @@ genericKeys conf = [
             ]
         ])
 
-    , ("n", promptedNewWorkspace False)
-    , ("S-n", promptedNewWorkspace True)
+    , ("n", Local.promptedNewWorkspace False)
+    , ("S-n", Local.promptedNewWorkspace True)
     , ("S-<Backspace>", WithAll.killAll >> DW.removeWorkspace)
     , ("S-r", DW.renameWorkspace xpConfig)
     , ("c", TD.changeDir xpConfig)
 
-    , ("r", swapScreens)
+    , ("r", Local.swapScreens)
 
     , ("a", TS.currentTopicAction topicConfig)
 
     -- Grid Select workspace
-    , ("i", goToSelected Local.gsConfig)
-    , ("s", gsw)
-    , ("S-s", gswShift)
+    , ("i", GS.goToSelected Local.gsConfig)
+    , ("s", Local.gsw)
+    , ("S-s", Local.gswShift)
 
       -- xmonad
     , ("q", SUB.submap $ EZ.mkKeymap conf $ concat
-- 
cgit