Minor fixes and code refactoring

16 files changed, 50 insertions, 44 deletions

diff --git a/readme.org b/readme.org
index 41c9410..e51f235 100644
--- a/readme.org
+++ b/readme.org
@@ -1,2 +1 @@
 * azahi's XMonad configuration (xmonad-ng)
-Moduled after [[https://github.com/pjones/xmonadrc][pjones']] xmonadrc this configuration has a few unique points to it.
diff --git a/src/Main.hs b/src/Main.hs
index 159cfaa..fadabec 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module Main where
 
diff --git a/src/XMonad/Actions/FloatSnapSpaced.hs b/src/XMonad/Actions/FloatSnapSpaced.hs
index 4113a13..5b5d572 100644
--- a/src/XMonad/Actions/FloatSnapSpaced.hs
+++ b/src/XMonad/Actions/FloatSnapSpaced.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Actions.FloatSnapSpaced
     ( snapSpacedMagicMove
diff --git a/src/XMonad/Actions/PerConditionKeys.hs b/src/XMonad/Actions/PerConditionKeys.hs
index faa33c1..a5a9e04 100644
--- a/src/XMonad/Actions/PerConditionKeys.hs
+++ b/src/XMonad/Actions/PerConditionKeys.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Actions.PerConditionKeys
     ( XCond(..)
diff --git a/src/XMonad/Custom/Bindings.hs b/src/XMonad/Custom/Bindings.hs
index fa7cb17..9192f7e 100644
--- a/src/XMonad/Custom/Bindings.hs
+++ b/src/XMonad/Custom/Bindings.hs
@@ -8,9 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Custom target for keyboard/mouse bindings.
---
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Bindings
     ( showKeyBindings
diff --git a/src/XMonad/Custom/Event.hs b/src/XMonad/Custom/Event.hs
index 926614b..4e0439e 100644
--- a/src/XMonad/Custom/Event.hs
+++ b/src/XMonad/Custom/Event.hs
@@ -8,9 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Custom target for layouts, sublayouts and everything in between.
---
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Event
     ( handleEventHook'
diff --git a/src/XMonad/Custom/Layout.hs b/src/XMonad/Custom/Layout.hs
index 0ad0de2..3a0a107 100644
--- a/src/XMonad/Custom/Layout.hs
+++ b/src/XMonad/Custom/Layout.hs
@@ -13,9 +13,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Custom target for layouts, sublayouts and layout transformers.
---
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Layout
     ( layoutHook'
diff --git a/src/XMonad/Custom/Manage.hs b/src/XMonad/Custom/Manage.hs
index ce5efe2..d3895ef 100644
--- a/src/XMonad/Custom/Manage.hs
+++ b/src/XMonad/Custom/Manage.hs
@@ -8,8 +8,6 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Custom target for container (window) management.
---
 -----------------------------------------------------------------------------
 
 module XMonad.Custom.Manage
diff --git a/src/XMonad/Custom/Misc.hs b/src/XMonad/Custom/Misc.hs
index dbf7e2c..78fc0f1 100644
--- a/src/XMonad/Custom/Misc.hs
+++ b/src/XMonad/Custom/Misc.hs
@@ -10,9 +10,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Miscellaneous functions, data types and declarations used for 'XMonad.Custom'.
---
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Misc
     ( Applications (..)
diff --git a/src/XMonad/Custom/Navigation.hs b/src/XMonad/Custom/Navigation.hs
index decc2de..583d5ae 100644
--- a/src/XMonad/Custom/Navigation.hs
+++ b/src/XMonad/Custom/Navigation.hs
@@ -8,9 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Custom target for window navigation.
---
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Navigation
     ( navigation2DConfig
diff --git a/src/XMonad/Custom/Projects.hs b/src/XMonad/Custom/Projects.hs
index 6b3951c..44370aa 100644
--- a/src/XMonad/Custom/Projects.hs
+++ b/src/XMonad/Custom/Projects.hs
@@ -8,9 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
--- Custom target for projects.
---
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Projects
     ( projects
diff --git a/src/XMonad/Custom/Scratchpads.hs b/src/XMonad/Custom/Scratchpads.hs
index b5296cc..e468ae7 100644
--- a/src/XMonad/Custom/Scratchpads.hs
+++ b/src/XMonad/Custom/Scratchpads.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Scratchpads
     ( scratchpads
diff --git a/src/XMonad/Custom/Startup.hs b/src/XMonad/Custom/Startup.hs
index f2c0af0..b862b69 100644
--- a/src/XMonad/Custom/Startup.hs
+++ b/src/XMonad/Custom/Startup.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Startup
     ( startupHook'
@@ -41,7 +41,7 @@ addNETSupported x = withDisplay $ \d -> do
     n <- getAtom "_NET_SUPPORTED"
     a <- getAtom "ATOM"
     liftIO $ do
-        p <- (join . maybeToList) <$> getWindowProperty32 d n r
+        p <- join . maybeToList <$> getWindowProperty32 d n r
         when (fromIntegral x `notElem` p) $ changeProperty32 d r n a propModeAppend [fromIntegral x]
 
 addEWMHFullscreen :: X ()
@@ -51,8 +51,8 @@ addEWMHFullscreen = do
 
 startupHook' :: X ()
 startupHook' = do
-    spawnNamedPipe "/usr/bin/xmobar ~/.xmonad/xmobarrcTop.hs" "xmobarTop"
-    spawnNamedPipe "/usr/bin/xmobar ~/.xmonad/xmobarrcBot.hs" "xmobarBot"
+    spawnNamedPipe "/usr/bin/xmobar ~/work/xmonad-ng/xmobarrcTop.hs" "xmobarTop"
+    spawnNamedPipe "/usr/bin/xmobar ~/work/xmonad-ng/xmobarrcBot.hs" "xmobarBot"
     docksStartupHook
     addEWMHFullscreen
     setDefaultCursor xC_left_ptr
diff --git a/src/XMonad/Custom/Theme.hs b/src/XMonad/Custom/Theme.hs
index bad73e4..ed3cb8d 100644
--- a/src/XMonad/Custom/Theme.hs
+++ b/src/XMonad/Custom/Theme.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Theme
     ( font
diff --git a/src/XMonad/Custom/Workspaces.hs b/src/XMonad/Custom/Workspaces.hs
index a62b4af..881861c 100644
--- a/src/XMonad/Custom/Workspaces.hs
+++ b/src/XMonad/Custom/Workspaces.hs
@@ -8,7 +8,7 @@
 -- Stability   :  unstable
 -- Portability :  unportable
 --
-------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 module XMonad.Custom.Workspaces
     ( workspaces'
diff --git a/xmonad-ng.cabal b/xmonad-ng.cabal
index 970274f..2afc972 100644
--- a/xmonad-ng.cabal
+++ b/xmonad-ng.cabal
@@ -1,5 +1,5 @@
 name:          xmonad-ng
-version:       0.2.0.1
+version:       0.2.1.0
 synopsis:      azahi's XMonad configuration
 description:   azahi's XMonad configuration based on stolen code and bad Haskell knowledge
 homepage:      https://github.com/azahi/xmonad-ng
@@ -11,27 +11,50 @@ copyright:     Copyright (c) 2018 azahi
 category:      System
 build-type:    Simple
 stability:     experimental
-cabal-version: >=1.10
+cabal-version: >= 1.10
 
 source-repository head
-    type: git
+    type:     git
     location: https://github.com/azahi/xmonad-ng
 
 library
-    exposed-modules:
-        XMonad.Actions.FloatSnapSpaced
-        XMonad.Actions.PerConditionKeys
-    ghc-options: -Wall
+    ghc-options:      -Wall
+    hs-source-dirs:   src
+    default-language: Haskell2010
+
+    exposed-modules: XMonad.Actions.FloatSnapSpaced
+                   , XMonad.Actions.PerConditionKeys
+
     build-depends: base           >= 4.9    && < 4.10
                  , containers     >= 0.5    && < 0.6
                  , xmonad         >= 0.13   && < 0.14
                  , xmonad-contrib >= 0.13   && < 0.14
-    hs-source-dirs: src
-    default-language: Haskell2010
 
 executable xmonad-ng
-    main-is: Main.hs
-    ghc-options: -Wall
+    main-is:          Main.hs
+    ghc-options:      -Wall
+    hs-source-dirs:   src
+    default-language: Haskell2010
+
+    other-extensions: DeriveDataTypeable
+                    , MultiParamTypeClasses
+                    , TypeSynonymInstances
+
+    other-modules: XMonad.Actions.FloatSnapSpaced
+                 , XMonad.Actions.PerConditionKeys
+                 , XMonad.Custom.Bindings
+                 , XMonad.Custom.Event
+                 , XMonad.Custom.Layout
+                 , XMonad.Custom.Log
+                 , XMonad.Custom.Manage
+                 , XMonad.Custom.Misc
+                 , XMonad.Custom.Navigation
+                 , XMonad.Custom.Projects
+                 , XMonad.Custom.Scratchpads
+                 , XMonad.Custom.Startup
+                 , XMonad.Custom.Theme
+                 , XMonad.Custom.Workspaces
+
     build-depends: X11            >= 1.8    && < 1.9
                  , base           >= 4.9    && < 4.10
                  , containers     >= 0.5    && < 0.6
@@ -42,5 +65,3 @@ executable xmonad-ng
                  , xmonad         >= 0.13   && < 0.14
                  , xmonad-contrib >= 0.13   && < 0.14
                  , xmonad-extras  >= 0.13.0 && < 0.14
-    hs-source-dirs: src
-    default-language: Haskell2010