Added checkrc

Original code taken from:

  https://github.com/pjones/xmonadrc/blob/master/checkrc.hs

Author: Peter J. Jones <pjones@pmade.com>

Signed-off-by: Michal Minar <miminar@redhat.com>

3 files changed, 68 insertions, 71 deletions

diff --git a/src/XMonad/Local/Config.hs b/src/XMonad/Local/Config.hs
index 1f7420d..9d3506f 100644
--- a/src/XMonad/Local/Config.hs
+++ b/src/XMonad/Local/Config.hs
@@ -21,3 +21,4 @@ xpConfig = P.defaultXPConfig
     , P.font    = "-*-terminus-*-*-*-*-14-*-*-*-*-*-*-*"
     , P.height  = 24
     }
+
diff --git a/src/XMonad/Local/Layout.hs b/src/XMonad/Local/Layout.hs
index e75a78c..14bb6a5 100644
--- a/src/XMonad/Local/Layout.hs
+++ b/src/XMonad/Local/Layout.hs
@@ -10,7 +10,6 @@ import qualified XMonad.Layout.BoringWindows as BW
 import XMonad.Layout.Column
 import qualified XMonad.Layout.ComboP as CP
 import qualified XMonad.Layout.IM as IM
-import qualified XMonad.Layout.MouseResizableTile as MRT
 import qualified XMonad.Layout.MultiToggle as MT
 import qualified XMonad.Layout.Named as LN
 import XMonad.Layout.NoBorders
@@ -18,7 +17,6 @@ import qualified XMonad.Layout.PerWorkspace as PW
 import XMonad.Layout.Reflect
 import XMonad.Layout.SimpleFloat
 import XMonad.Layout.Simplest (Simplest(..))
-import XMonad.Layout.StackTile
 import XMonad.Layout.SubLayouts
 import qualified XMonad.Layout.Tabbed as Tab
 import XMonad.Layout.ThreeColumns
@@ -30,6 +28,60 @@ import XMonad.Layout.WindowNavigation
 import XMonad.Layout.TopicDir as TD
 import XMonad.Local.TopicSpace as Local
 
+layoutHook = avoidStruts
+             $ TD.topicDir Local.topicDirs
+             $ PW.onWorkspace "chat" chatL
+             $ PW.onWorkspace "gimp" gimpL
+             $ PW.onWorkspace "BG" bgL
+             $ PW.onWorkspace "remote" remoteL
+             $ PW.onWorkspaces ["homam5", "civ4", "pst", "ciV"] wineGameL
+             $ easyLay
+
+nmaster = 1
+ratio = 1/2
+delta = 3/100
+
+tiled = Tall nmaster delta ratio
+threecol = ThreeColMid nmaster delta (1/3)
+
+-- common layouts
+easyLay = windowNavigation baseLay 
+baseLay = smartBorders $ (mySubTabbed $ BW.boringWindows $ toggleLayouts threecol
+                 (   MT.mkToggle (MT.single REFLECTX) tiled
+                 ||| MT.mkToggle (MT.single REFLECTY) (Mirror tiled)))
+         ||| (BW.boringWindows $ Tab.tabbed Tab.shrinkText myTabTheme)
+
+-- workspace layouts
+chatL = IM.withIM (1%5) (IM.ClassName "Skype"
+             `IM.And`   (        IM.Title "minarmc - Skype™ (Beta)"
+                        `IM.Or`  IM.Title "Skype™ 2.2 (Beta) for Linux"
+                        `IM.Or`  IM.Title "minarmc - Skype™"))
+      $ IM.withIM (1%5) (        IM.ClassName "Empathy"
+                        `IM.And` (IM.Title "Contact List" `IM.Or` IM.Role "contact_list"))
+      $ easyLay
+
+gimpL = LN.named "GIMP"
+      -- $ configurableNavigation noNavigateBorders $ BW.boringWindows
+      $ windowNavigation
+      $ smartBorders
+      $ IM.withIM (11/64) (IM.Role "gimp-toolbox")
+      $ CP.combineTwoP
+            (reflectHoriz $ TwoPane delta 0.2)
+            (Column 0)
+            (mySubTabbed $ BW.boringWindows Accordion)
+            (        CP.ClassName "Gimp"
+            `CP.And` CP.Not (CP.Role "gimp-image-window"))
+
+bgL = windowNavigation $ BW.boringWindows $ smartBorders
+    $ reflectHoriz $ Tall nmaster delta (7/9)
+
+remoteL = windowNavigation $ BW.boringWindows $ smartBorders
+        $ Tab.tabbed Tab.shrinkText myTabTheme
+
+wineGameL = smartBorders $ simpleFloat ||| Full
+
+mySubTabbed x = Tab.addTabs Tab.shrinkText myTabTheme $ subLayout [] Simplest x
+
 myTabTheme :: Tab.Theme
 myTabTheme = Tab.defaultTheme
     { Tab.activeTextColor = "#ffffff"
@@ -45,72 +97,3 @@ myTabTheme = Tab.defaultTheme
     , Tab.decoHeight = 24
     }
 
-layoutHook = avoidStruts
-             $ TD.topicDir Local.topicDirs
-             $ PW.onWorkspace "chat" chatL
-             $ PW.onWorkspace "gimp" gimpL
-             $ PW.onWorkspace "BG" bgL
-             $ PW.onWorkspace "remote" remoteL
-             $ PW.onWorkspaces ["homam5", "civ4", "pst", "ciV"] wineGameL
-             $ _easyLay
-  where
-    -- basic layouts
-    _tiled = Tall nmaster delta ratio
-    _threecol = ThreeColMid nmaster delta (1/3)
-    _stack = StackTile nmaster delta ratio
-    nmaster = 1
-    ratio = 1/2
-    delta = 3/100
-    _mrt = MRT.mouseResizableTile
-             { MRT.draggerType = MRT.FixedDragger
-                { MRT.gapWidth = 2, MRT.draggerWidth = 2 }
-             }
-    _mrt2 = MRT.mouseResizableTile
-             { MRT.masterFrac = 0.8
-             , MRT.fracIncrement = delta
-             , MRT.draggerType = MRT.BordersDragger
-             }
-
-    -- common layouts
-    _easyLay = windowNavigation _baseLay 
-    _baseLay = smartBorders $ (mySubTabbed $ BW.boringWindows $ toggleLayouts _threecol
-                     (   MT.mkToggle (MT.single REFLECTX) _tiled
-                     ||| MT.mkToggle (MT.single REFLECTY) (Mirror _tiled)))
-             ||| (BW.boringWindows $ Tab.tabbed Tab.shrinkText myTabTheme)
-
-    -- workspace layouts
-    chatL = IM.withIM (1%5) (IM.ClassName "Skype"
-                 `IM.And`   (        IM.Title "minarmc - Skype™ (Beta)"
-                            `IM.Or`  IM.Title "Skype™ 2.2 (Beta) for Linux"
-                            `IM.Or`  IM.Title "minarmc - Skype™"))
-          $ IM.withIM (1%5) (        IM.ClassName "Empathy"
-                            `IM.And` (IM.Title "Contact List" `IM.Or` IM.Role "contact_list"))
-          {--
-          $ IM.withIM (1%5) (        IM.ClassName "Pidgin"
-                            `IM.And` IM.Role "buddy_list")
-          --}
-          {--
-          $ IM.withIM (1%5) (        IM.ClassName "Google-chrome"
-                            `IM.And` IM.Title "Hangouts")
-          --}
-          $ _easyLay
-
-    gimpL = LN.named "GIMP"
-          -- $ configurableNavigation noNavigateBorders $ BW.boringWindows
-          $ windowNavigation
-          $ smartBorders
-          $ IM.withIM (11/64) (IM.Role "gimp-toolbox")
-          $ CP.combineTwoP
-                (reflectHoriz $ TwoPane delta 0.2)
-                (Column 0)
-                (mySubTabbed $ BW.boringWindows Accordion)
-                (        CP.ClassName "Gimp"
-                `CP.And` CP.Not (CP.Role "gimp-image-window"))
-
-    bgL = windowNavigation $ BW.boringWindows $ smartBorders $ reflectHoriz $ Tall nmaster delta (7/9)
-
-    remoteL = windowNavigation $ BW.boringWindows $ smartBorders $ Tab.tabbed Tab.shrinkText myTabTheme
-
-    wineGameL = smartBorders $ simpleFloat ||| Full
-
-    mySubTabbed x = Tab.addTabs Tab.shrinkText myTabTheme $ subLayout [] Simplest x
diff --git a/src/XMonad/Local/XConfig.hs b/src/XMonad/Local/XConfig.hs
new file mode 100644
index 0000000..c8b7d22
--- /dev/null
+++ b/src/XMonad/Local/XConfig.hs
@@ -0,0 +1,13 @@
+{-# OPTIONS -fno-warn-missing-signatures #-}
+
+module XMonad.Local.XConfig (xConfig) where
+
+import XMonad
+import XMonad.Config.Desktop
+
+import qualified XMonad.Local.Keys as Local
+
+xConfig = desktopConfig
+    { XMonad.modMask = Local.modMask
+    , XMonad.keys    = Local.keyBindings
+    }