Rework Custom

Change the names of high-order functoins
Remove named keybindings
Add check executable for keybindings
Expand xmonad-ng library
Bump to 0.15.1

1 files changed, 27 insertions, 28 deletions

diff --git a/src/Main.hs b/src/Main.hs
index 27379ab..9afb3a1 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -15,24 +15,23 @@ module Main where
 import           XMonad
 import           XMonad.Actions.DynamicProjects
 import           XMonad.Actions.Navigation2D
-import qualified XMonad.Custom.Bindings         as Custom
-import qualified XMonad.Custom.Event            as Custom
-import qualified XMonad.Custom.Layout           as Custom
-import qualified XMonad.Custom.Log              as Custom
-import qualified XMonad.Custom.Manage           as Custom
-import qualified XMonad.Custom.Misc             as Custom
-import qualified XMonad.Custom.Navigation       as Custom
-import qualified XMonad.Custom.Projects         as Custom
-import qualified XMonad.Custom.Startup          as Custom
-import qualified XMonad.Custom.Theme            as Custom
-import qualified XMonad.Custom.Workspaces       as Custom
+import qualified XMonad.Custom.Bindings         as C
+import qualified XMonad.Custom.Event            as C
+import qualified XMonad.Custom.Layout           as C
+import qualified XMonad.Custom.Log              as C
+import qualified XMonad.Custom.Manage           as C
+import qualified XMonad.Custom.Misc             as C
+import qualified XMonad.Custom.Navigation       as C
+import qualified XMonad.Custom.Projects         as C
+import qualified XMonad.Custom.Startup          as C
+import qualified XMonad.Custom.Theme            as C
+import qualified XMonad.Custom.Workspaces       as C
 import           XMonad.Hooks.DynamicLog
 import           XMonad.Hooks.EwmhDesktops
 import           XMonad.Hooks.ManageDocks
 import           XMonad.Hooks.UrgencyHook
 import           XMonad.Layout.Fullscreen
 import qualified XMonad.StackSet                as S
-import           XMonad.Util.NamedActions
 import           XMonad.Util.NamedWindows
 import           XMonad.Util.Run
 
@@ -43,7 +42,7 @@ instance UrgencyHook NotifyUrgencyHook where
     urgencyHook NotifyUrgencyHook w = do
         n      <- getName w
         Just i <- S.findTag w <$> gets windowset
-        safeSpawn (Custom.notify Custom.customApplications) [show n, "workspace " ++ wrap "[" "]" i]
+        safeSpawn (C.notify C.applications) [show n, "workspace " ++ wrap "[" "]" i]
 
 main :: IO ()
 main = xmonad
@@ -51,21 +50,21 @@ main = xmonad
        $ fullscreenSupport
        $ docks
        $ withUrgencyHook NotifyUrgencyHook
-       $ withNavigation2DConfig Custom.navigation2DConfig
-       $ dynamicProjects Custom.projects
-       $ addDescrKeys' ((Custom.modMask', xK_F1), Custom.showKeyBindings) Custom.keyBindings
-       $ def { borderWidth        = Custom.border
-             , workspaces         = Custom.workspaces' -- TODO save WS state
-             , layoutHook         = Custom.layoutHook' -- TODO save layout state and floating W position
-             , terminal           = Custom.term Custom.customApplications
-             , normalBorderColor  = Custom.colorN
-             , focusedBorderColor = Custom.colorF
-             , modMask            = Custom.modMask'
-             , logHook            = Custom.logHook'
-             , startupHook        = Custom.startupHook'
-             , mouseBindings      = Custom.mouseBindings'
-             , manageHook         = Custom.manageHook'
-             , handleEventHook    = Custom.handleEventHook'
+       $ withNavigation2DConfig C.navigation
+       $ dynamicProjects C.projects
+       $ def { borderWidth        = C.border
+             , workspaces         = C.workspaces -- TODO save WS state
+             , layoutHook         = C.layoutHook -- TODO save layout state and floating W position
+             , terminal           = C.term C.applications
+             , normalBorderColor  = C.colorN
+             , focusedBorderColor = C.colorF
+             , modMask            = C.modMask
+             , keys               = C.keys
+             , logHook            = C.logHook
+             , startupHook        = C.startupHook
+             , mouseBindings      = C.mouseBindings
+             , manageHook         = C.manageHook
+             , handleEventHook    = C.handleEventHook
              , focusFollowsMouse  = False
              , clickJustFocuses   = False
              }