From cf10110043ffd857fa12e26486dd53a38ff432b6 Mon Sep 17 00:00:00 2001 From: azahi Date: Sat, 11 Aug 2018 03:40:50 +0300 Subject: Minor fixes and code refactoring --- src/Main.hs | 2 +- src/XMonad/Actions/FloatSnapSpaced.hs | 2 +- src/XMonad/Actions/PerConditionKeys.hs | 2 +- src/XMonad/Custom/Bindings.hs | 4 +--- src/XMonad/Custom/Event.hs | 4 +--- src/XMonad/Custom/Layout.hs | 4 +--- src/XMonad/Custom/Manage.hs | 2 -- src/XMonad/Custom/Misc.hs | 4 +--- src/XMonad/Custom/Navigation.hs | 4 +--- src/XMonad/Custom/Projects.hs | 4 +--- src/XMonad/Custom/Scratchpads.hs | 2 +- src/XMonad/Custom/Startup.hs | 8 ++++---- src/XMonad/Custom/Theme.hs | 2 +- src/XMonad/Custom/Workspaces.hs | 2 +- 14 files changed, 16 insertions(+), 30 deletions(-) (limited to 'src') 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' -- cgit 1.4.1