From daaa4cf16f1561156537abc96317045b5f7e55d9 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Mon, 2 Dec 2019 18:04:34 +0300 Subject: haddock, stylish-haskell, stylish-cabal --- src/Main.hs | 19 ++++++++--------- src/XMonad/Actions/FloatSnapSpaced.hs | 15 ++++++-------- src/XMonad/Actions/PerConditionKeys.hs | 15 ++++++-------- src/XMonad/Custom/Bindings.hs | 37 ++++++++++++++-------------------- src/XMonad/Custom/Event.hs | 17 +++++++--------- src/XMonad/Custom/Layout.hs | 17 +++++++--------- src/XMonad/Custom/Log.hs | 19 +++++++---------- src/XMonad/Custom/Manage.hs | 17 +++++++--------- src/XMonad/Custom/Misc.hs | 15 ++++++-------- src/XMonad/Custom/Navigation.hs | 15 ++++++-------- src/XMonad/Custom/Projects.hs | 15 ++++++-------- src/XMonad/Custom/Prompt.hs | 15 ++++++-------- src/XMonad/Custom/Scratchpads.hs | 15 ++++++-------- src/XMonad/Custom/Startup.hs | 17 +++++++--------- src/XMonad/Custom/Theme.hs | 17 +++++++--------- src/XMonad/Custom/Workspaces.hs | 17 +++++++--------- 16 files changed, 114 insertions(+), 168 deletions(-) (limited to 'src') diff --git a/src/Main.hs b/src/Main.hs index 716e0a1..9cb5e98 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : Main --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : Main +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module Main where @@ -38,8 +35,8 @@ main = xmonad $ 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 + , workspaces = C.workspaces + , layoutHook = C.layoutHook , terminal = C.term C.applications , normalBorderColor = C.colorN , focusedBorderColor = C.colorF diff --git a/src/XMonad/Actions/FloatSnapSpaced.hs b/src/XMonad/Actions/FloatSnapSpaced.hs index fb836e1..f43558a 100644 --- a/src/XMonad/Actions/FloatSnapSpaced.hs +++ b/src/XMonad/Actions/FloatSnapSpaced.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Actions.FloatSnapSpaced --- Copyright : (c) 2009 Anders Engstrom --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Actions.FloatSnapSpaced +-- Copyright : (c) 2009 Anders Engstrom +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Actions.FloatSnapSpaced ( snapSpacedMagicMove diff --git a/src/XMonad/Actions/PerConditionKeys.hs b/src/XMonad/Actions/PerConditionKeys.hs index 188fe96..2099e1d 100644 --- a/src/XMonad/Actions/PerConditionKeys.hs +++ b/src/XMonad/Actions/PerConditionKeys.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Actions.PerConditionKeys --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Actions.PerConditionKeys +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Actions.PerConditionKeys ( XCond(..) diff --git a/src/XMonad/Custom/Bindings.hs b/src/XMonad/Custom/Bindings.hs index ab653dd..f48416a 100644 --- a/src/XMonad/Custom/Bindings.hs +++ b/src/XMonad/Custom/Bindings.hs @@ -1,16 +1,13 @@ {-# LANGUAGE LambdaCase #-} ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Bindings --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Bindings +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Bindings ( keys @@ -21,8 +18,8 @@ module XMonad.Custom.Bindings import qualified Data.Map as M import System.Exit -import XMonad hiding (keys, modMask, - mouseBindings) +import XMonad hiding ( keys, modMask, + mouseBindings ) import XMonad.Actions.CopyWindow import XMonad.Actions.CycleWS import XMonad.Actions.DynamicProjects @@ -174,7 +171,7 @@ keysSpawnables _ = , ("M-v" , namedScratchpadAction scratchpads "volume") ] -keysWindows :: XConfig Layout -> [(String, X())] +keysWindows :: XConfig Layout -> [(String, X ())] keysWindows _ = [ ("M-d" , kill) , ("M-S-d" , confirmPrompt hotPromptTheme "Kill all" killAll) @@ -202,7 +199,7 @@ keysWindows _ = ++ zipKeys' "M-S-" arrowKeys directions windowToScreen True ++ zipKeys' "M-C-" arrowKeys directions screenSwap True -keysLayout :: XConfig Layout -> [(String, X())] +keysLayout :: XConfig Layout -> [(String, X ())] keysLayout c = [ ("M-" , sendMessage NextLayout) , ("M-C-" , toSubl NextLayout) @@ -219,7 +216,7 @@ keysLayout c = , ("M-C-g" , sendMessage $ Toggle GAPS) -- FIXME Breaks merged tabbed layout ] -keysResize :: XConfig Layout -> [(String, X())] +keysResize :: XConfig Layout -> [(String, X ())] keysResize _ = [ ("M-[" , tryMessageR_ (ExpandTowards L) Shrink) , ("M-]" , tryMessageR_ (ExpandTowards R) Expand) @@ -235,14 +232,10 @@ mouseBindings :: XConfig Layout -> M.Map (KeyMask, Button) (Window -> X ()) mouseBindings XConfig {} = M.fromList [ ((modMask, button1), \w -> focus w >> F.mouseWindow F.position w - >> ifClick (snapSpacedMagicMove gapFull - (Just 50) (Just 50) w) - >> windows S.shiftMaster - ) + >> ifClick (snapSpacedMagicMove gapFull (Just 50) (Just 50) w) + >> windows S.shiftMaster) , ((modMask, button3), \w -> focus w >> F.mouseWindow F.linear w - >> ifClick (snapMagicResize [L, R, U, D] - (Just 50) (Just 50) w) - >> windows S.shiftMaster - ) + >> ifClick (snapMagicResize [L, R, U, D] (Just 50) (Just 50) w) + >> windows S.shiftMaster) ] diff --git a/src/XMonad/Custom/Event.hs b/src/XMonad/Custom/Event.hs index fa82bdf..fe24309 100644 --- a/src/XMonad/Custom/Event.hs +++ b/src/XMonad/Custom/Event.hs @@ -1,21 +1,18 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Event --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Event +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Event ( handleEventHook ) where import Data.Monoid -import XMonad hiding (handleEventHook) +import XMonad hiding ( handleEventHook ) import XMonad.Custom.Scratchpads import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.ManageDocks diff --git a/src/XMonad/Custom/Layout.hs b/src/XMonad/Custom/Layout.hs index 5da2cf6..738beeb 100644 --- a/src/XMonad/Custom/Layout.hs +++ b/src/XMonad/Custom/Layout.hs @@ -3,24 +3,21 @@ {-# LANGUAGE TypeSynonymInstances #-} {-# OPTIONS_GHC -Wno-missing-signatures #-} ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Layout --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Layout +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Layout ( layoutHook , CustomTransformers (..) ) where -import XMonad hiding (layoutHook) +import XMonad hiding ( layoutHook ) import XMonad.Custom.Theme import XMonad.Hooks.ManageDocks import XMonad.Layout.Accordion diff --git a/src/XMonad/Custom/Log.hs b/src/XMonad/Custom/Log.hs index ed4edc4..5a918c9 100644 --- a/src/XMonad/Custom/Log.hs +++ b/src/XMonad/Custom/Log.hs @@ -1,23 +1,18 @@ -{-# LANGUAGE LambdaCase #-} - ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Log --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) --- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Log +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- ------------------------------------------------------------------------------ module XMonad.Custom.Log ( logHook ) where import System.IO -import XMonad hiding (logHook) +import XMonad hiding ( logHook ) import XMonad.Actions.CopyWindow import XMonad.Custom.Theme import XMonad.Hooks.CurrentWorkspaceOnTop diff --git a/src/XMonad/Custom/Manage.hs b/src/XMonad/Custom/Manage.hs index bbae103..d6c539f 100644 --- a/src/XMonad/Custom/Manage.hs +++ b/src/XMonad/Custom/Manage.hs @@ -1,20 +1,17 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Manage --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Manage +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Manage ( manageHook ) where -import XMonad hiding (manageHook) +import XMonad hiding ( manageHook ) import XMonad.Custom.Scratchpads import XMonad.Hooks.InsertPosition import XMonad.Hooks.ManageDocks diff --git a/src/XMonad/Custom/Misc.hs b/src/XMonad/Custom/Misc.hs index d4b162e..5e3e566 100644 --- a/src/XMonad/Custom/Misc.hs +++ b/src/XMonad/Custom/Misc.hs @@ -1,16 +1,13 @@ {-# OPTIONS_GHC -funbox-strict-fields #-} ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Misc --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Misc +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Misc ( Applications (..) diff --git a/src/XMonad/Custom/Navigation.hs b/src/XMonad/Custom/Navigation.hs index 4057e8b..20a8769 100644 --- a/src/XMonad/Custom/Navigation.hs +++ b/src/XMonad/Custom/Navigation.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Navigation --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Navigation +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Navigation ( navigation diff --git a/src/XMonad/Custom/Projects.hs b/src/XMonad/Custom/Projects.hs index 5382cb2..a8a7504 100644 --- a/src/XMonad/Custom/Projects.hs +++ b/src/XMonad/Custom/Projects.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Projects --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Projects +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Projects ( projects diff --git a/src/XMonad/Custom/Prompt.hs b/src/XMonad/Custom/Prompt.hs index 9e046c6..4ae6d24 100644 --- a/src/XMonad/Custom/Prompt.hs +++ b/src/XMonad/Custom/Prompt.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Prompt --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Prompt +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Prompt ( listCompFunc diff --git a/src/XMonad/Custom/Scratchpads.hs b/src/XMonad/Custom/Scratchpads.hs index 4ccce47..3d57f4b 100644 --- a/src/XMonad/Custom/Scratchpads.hs +++ b/src/XMonad/Custom/Scratchpads.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Scratchpads --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Scratchpads +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Scratchpads ( scratchpads diff --git a/src/XMonad/Custom/Startup.hs b/src/XMonad/Custom/Startup.hs index eef4c4c..546bc32 100644 --- a/src/XMonad/Custom/Startup.hs +++ b/src/XMonad/Custom/Startup.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Startup --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Startup +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Startup ( startupHook @@ -16,7 +13,7 @@ module XMonad.Custom.Startup import Control.Monad import Data.Maybe -import XMonad hiding (startupHook) +import XMonad hiding ( startupHook ) import XMonad.Hooks.ManageDocks import XMonad.Hooks.SetWMName import XMonad.Util.Cursor diff --git a/src/XMonad/Custom/Theme.hs b/src/XMonad/Custom/Theme.hs index 3855fd9..8b32b50 100644 --- a/src/XMonad/Custom/Theme.hs +++ b/src/XMonad/Custom/Theme.hs @@ -1,14 +1,11 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Theme --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Theme +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Theme ( font @@ -41,10 +38,10 @@ module XMonad.Custom.Theme import Data.Char import Data.Function import Data.List +import Data.Ratio import Graphics.X11.Xlib.Types import XMonad.Layout.Decoration import qualified XMonad.Prompt as P -import Data.Ratio font :: String font = "xft:tewi:style=Regular:size=8" -- TODO CJKのフォールバックフォントを追加する diff --git a/src/XMonad/Custom/Workspaces.hs b/src/XMonad/Custom/Workspaces.hs index 5832c6e..efc0704 100644 --- a/src/XMonad/Custom/Workspaces.hs +++ b/src/XMonad/Custom/Workspaces.hs @@ -1,21 +1,18 @@ ------------------------------------------------------------------------------ -- | --- Module : XMonad.Custom.Workspaces --- Copyright : (c) 2018-2019 Azat Bahawi --- License : BSD3-style (see LICENSE) +-- Module : XMonad.Custom.Workspaces +-- Copyright : (c) 2018-2019 Azat Bahawi +-- License : BSD3-style (see LICENSE) +-- Maintainer : Azat Bahawi +-- Stability : unstable +-- Portability : unportable -- --- Maintainer : Azat Bahawi --- Stability : unstable --- Portability : unportable --- ------------------------------------------------------------------------------ module XMonad.Custom.Workspaces ( workspaces ) where import XMonad.Actions.DynamicProjects -import XMonad.Core hiding (workspaces) +import XMonad.Core hiding ( workspaces ) workspaces :: [WorkspaceId] workspaces = map show [1..9 :: Int] -- cgit 1.4.1