diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml new file mode 100644 index 0000000..076e137 --- /dev/null +++ b/.stylish-haskell.yaml @@ -0,0 +1,264 @@ +# stylish-haskell configuration file +# ================================== + +# The stylish-haskell tool is mainly configured by specifying steps. These steps +# are a list, so they have an order, and one specific step may appear more than +# once (if needed). Each file is processed by these steps in the given order. +steps: + # Convert some ASCII sequences to their Unicode equivalents. This is disabled + # by default. + # - unicode_syntax: + # # In order to make this work, we also need to insert the UnicodeSyntax + # # language pragma. If this flag is set to true, we insert it when it's + # # not already present. You may want to disable it if you configure + # # language extensions using some other method than pragmas. Default: + # # true. + # add_language_pragma: true + + # Format record definitions + - records: {} + + # Align the right hand side of some elements. This is quite conservative + # and only applies to statements where each element occupies a single + # line. All default to true. + - simple_align: + cases: true + top_level_patterns: true + records: true + + # Import cleanup + - imports: + # There are different ways we can align names and lists. + # + # - global: Align the import names and import list throughout the entire + # file. + # + # - file: Like global, but don't add padding when there are no qualified + # imports in the file. + # + # - group: Only align the imports per group (a group is formed by adjacent + # import lines). + # + # - none: Do not perform any alignment. + # + # Default: global. + align: group + + # The following options affect only import list alignment. + # + # List align has following options: + # + # - after_alias: Import list is aligned with end of import including + # 'as' and 'hiding' keywords. + # + # > import qualified Data.List as List (concat, foldl, foldr, head, + # > init, last, length) + # + # - with_alias: Import list is aligned with start of alias or hiding. + # + # > import qualified Data.List as List (concat, foldl, foldr, head, + # > init, last, length) + # + # - with_module_name: Import list is aligned `list_padding` spaces after + # the module name. + # + # > import qualified Data.List as List (concat, foldl, foldr, head, + # init, last, length) + # + # This is mainly intended for use with `pad_module_names: false`. + # + # > import qualified Data.List as List (concat, foldl, foldr, head, + # init, last, length, scanl, scanr, take, drop, + # sort, nub) + # + # - new_line: Import list starts always on new line. + # + # > import qualified Data.List as List + # > (concat, foldl, foldr, head, init, last, length) + # + # Default: after_alias + list_align: after_alias + + # Right-pad the module names to align imports in a group: + # + # - true: a little more readable + # + # > import qualified Data.List as List (concat, foldl, foldr, + # > init, last, length) + # > import qualified Data.List.Extra as List (concat, foldl, foldr, + # > init, last, length) + # + # - false: diff-safe + # + # > import qualified Data.List as List (concat, foldl, foldr, init, + # > last, length) + # > import qualified Data.List.Extra as List (concat, foldl, foldr, + # > init, last, length) + # + # Default: true + pad_module_names: true + + # Long list align style takes effect when import is too long. This is + # determined by 'columns' setting. + # + # - inline: This option will put as much specs on same line as possible. + # + # - new_line: Import list will start on new line. + # + # - new_line_multiline: Import list will start on new line when it's + # short enough to fit to single line. Otherwise it'll be multiline. + # + # - multiline: One line per import list entry. + # Type with constructor list acts like single import. + # + # > import qualified Data.Map as M + # > ( empty + # > , singleton + # > , ... + # > , delete + # > ) + # + # Default: inline + long_list_align: multiline + + # Align empty list (importing instances) + # + # Empty list align has following options + # + # - inherit: inherit list_align setting + # + # - right_after: () is right after the module name: + # + # > import Vector.Instances () + # + # Default: inherit + empty_list_align: inherit + + # List padding determines indentation of import list on lines after import. + # This option affects 'long_list_align'. + # + # - : constant value + # + # - module_name: align under start of module name. + # Useful for 'file' and 'group' align settings. + # + # Default: 4 + list_padding: 4 + + # Separate lists option affects formatting of import list for type + # or class. The only difference is single space between type and list + # of constructors, selectors and class functions. + # + # - true: There is single space between Foldable type and list of it's + # functions. + # + # > import Data.Foldable (Foldable (fold, foldl, foldMap)) + # + # - false: There is no space between Foldable type and list of it's + # functions. + # + # > import Data.Foldable (Foldable(fold, foldl, foldMap)) + # + # Default: true + separate_lists: true + + # Space surround option affects formatting of import lists on a single + # line. The only difference is single space after the initial + # parenthesis and a single space before the terminal parenthesis. + # + # - true: There is single space associated with the enclosing + # parenthesis. + # + # > import Data.Foo ( foo ) + # + # - false: There is no space associated with the enclosing parenthesis + # + # > import Data.Foo (foo) + # + # Default: false + space_surround: false + + # Language pragmas + - language_pragmas: + # We can generate different styles of language pragma lists. + # + # - vertical: Vertical-spaced language pragmas, one per line. + # + # - compact: A more compact style. + # + # - compact_line: Similar to compact, but wrap each line with + # `{-#LANGUAGE #-}'. + # + # Default: vertical. + style: vertical + + # Align affects alignment of closing pragma brackets. + # + # - true: Brackets are aligned in same column. + # + # - false: Brackets are not aligned together. There is only one space + # between actual import and closing bracket. + # + # Default: true + align: true + + # stylish-haskell can detect redundancy of some language pragmas. If this + # is set to true, it will remove those redundant pragmas. Default: true. + remove_redundant: true + + # Language prefix to be used for pragma declaration, this allows you to + # use other options non case-sensitive like "language" or "Language". + # If a non correct String is provided, it will default to: LANGUAGE. + language_prefix: LANGUAGE + + # Replace tabs by spaces. This is disabled by default. + # - tabs: + # # Number of spaces to use for each tab. Default: 8, as specified by the + # # Haskell report. + # spaces: 8 + + # Remove trailing whitespace + - trailing_whitespace: {} + + # Squash multiple spaces between the left and right hand sides of some + # elements into single spaces. Basically, this undoes the effect of + # simple_align but is a bit less conservative. + # - squash: {} + +# A common indentation setting. Different steps take this into account. +indent: 4 + +# A common setting is the number of columns (parts of) code will be wrapped +# to. Different steps take this into account. +# +# Set this to null to disable all line wrapping. +# +# Default: 80. +columns: 80 + +# By default, line endings are converted according to the OS. You can override +# preferred format here. +# +# - native: Native newline format. CRLF on Windows, LF on other OSes. +# +# - lf: Convert to LF ("\n"). +# +# - crlf: Convert to CRLF ("\r\n"). +# +# Default: native. +newline: native + +# Sometimes, language extensions are specified in a cabal file or from the +# command line instead of using language pragmas in the file. stylish-haskell +# needs to be aware of these, so it can parse the file correctly. +# +# No language extensions are enabled by default. +# language_extensions: + # - TemplateHaskell + # - QuasiQuotes + +# Attempt to find the cabal file in ancestors of the current directory, and +# parse options (currently only language extensions) from that. +# +# Default: true +cabal: true diff --git a/bin/powermon.hs b/bin/powermon.hs index 870aad5..fb15012 100644 --- a/bin/powermon.hs +++ b/bin/powermon.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} -import SendXMsg import ACPI +import SendXMsg import Control.Monad @@ -9,22 +9,22 @@ import Data.ByteString import Data.ByteString.Char8 as C import Data.Connection -import System.IO.Streams.Internal as S (read) +import System.IO.Streams.Internal as S (read) import System.IO.Streams.UnixSocket splitLine :: ByteString -> [ByteString] splitLine = C.words . C.reverse . C.dropWhile (== '\n') . C.reverse parseLine :: ByteString -> Maybe ACPIEvent -parseLine line = +parseLine line = -- TODO what if we don't have a list this long (we crash) case (line' !! 1, line' !! 2) of - ("PBTN", _) -> Just Power - ("PWRF", _) -> Just Power - ("SLPB", _) -> Just Sleep - ("SBTN", _) -> Just Sleep + ("PBTN", _) -> Just Power + ("PWRF", _) -> Just Power + ("SLPB", _) -> Just Sleep + ("SBTN", _) -> Just Sleep ("LID", "close") -> Just LidClose - _ -> Nothing + _ -> Nothing where line' = splitLine line diff --git a/bin/xit-event.hs b/bin/xit-event.hs index 76cfc84..77b6f86 100644 --- a/bin/xit-event.hs +++ b/bin/xit-event.hs @@ -19,4 +19,4 @@ main = getArgs >>= parse parse :: [String] -> IO () parse [magic, tag] = sendXMsg magic tag >> exitSuccess -parse _ = exitFailure +parse _ = exitFailure diff --git a/bin/xmobar.hs b/bin/xmobar.hs index cbafa53..dcf05f0 100644 --- a/bin/xmobar.hs +++ b/bin/xmobar.hs @@ -1,12 +1,12 @@ -- import Xmobar.Backlight -import Xmobar.Screensaver +import Xmobar.Screensaver -import qualified Theme as T +import qualified Theme as T -import Data.List +import Data.List -import Xmobar -import XMonad (getXMonadDir) +import Xmobar +import XMonad (getXMonadDir) wrapColor :: String -> String -> String wrapColor c s = "" ++ s ++ "" @@ -77,7 +77,7 @@ config confDir = defaultConfig , persistent = True , iconRoot = confDir ++ "/icons" - , commands = + , commands = [ Run $ Alsa "default" "Master" [ "-t", "%" , "--" diff --git a/bin/xmonad.hs b/bin/xmonad.hs index 35836d2..00ad32c 100644 --- a/bin/xmonad.hs +++ b/bin/xmonad.hs @@ -1,46 +1,47 @@ -{-# LANGUAGE MultiWayIf #-} {-# LANGUAGE LambdaCase #-} +{-# LANGUAGE MultiWayIf #-} module Main (main) where import ACPI -import SendXMsg -import Notify -import Shell import DBus.Client (Client) +import Notify +import SendXMsg +import Shell -import DBus.Common import DBus.Backlight +import DBus.Common import qualified Theme as T -import Control.Monad (mapM_, forM, forM_, void, when) +import Control.Monad (forM, forM_, mapM_, void, when) -import Data.List (find, sortBy, sortOn) +import Data.List (find, sortBy, sortOn) import qualified Data.Map.Lazy as M -import Data.Maybe (catMaybes, isJust) -import Data.Monoid (All(..)) +import Data.Maybe (catMaybes, isJust) +import Data.Monoid (All (..)) +import Graphics.X11.Types import Graphics.X11.Xlib.Atom import Graphics.X11.Xlib.Extras -import Graphics.X11.Types import Graphics.X11.Xrandr -import Control.Arrow (first) +import Control.Arrow (first) import Control.Exception import System.Directory import System.Exit import System.IO -import System.Process (waitForProcess) -import System.Process.Internals - ( ProcessHandle__(ClosedHandle, OpenHandle) - , withProcessHandle - , mkProcessHandle) import System.Posix.IO import System.Posix.Process import System.Posix.Signals import System.Posix.Types +import System.Process (waitForProcess) +import System.Process.Internals + ( ProcessHandle__ (ClosedHandle, OpenHandle) + , mkProcessHandle + , withProcessHandle + ) import Text.Read (readMaybe) @@ -99,15 +100,15 @@ main = do spawnPipe' :: MonadIO m => String -> m (ProcessID, Handle) spawnPipe' x = io $ do - (rd, wr) <- createPipe - setFdOption wr CloseOnExec True - h <- fdToHandle wr - hSetBuffering h LineBuffering - p <- xfork $ do - _ <- dupTo rd stdInput - executeFile "/bin/sh" False ["-c", x] Nothing - closeFd rd - return (p, h) + (rd, wr) <- createPipe + setFdOption wr CloseOnExec True + h <- fdToHandle wr + hSetBuffering h LineBuffering + p <- xfork $ do + _ <- dupTo rd stdInput + executeFile "/bin/sh" False ["-c", x] Nothing + closeFd rd + return (p, h) myWorkspaces = map show [1..10 :: Int] @@ -373,7 +374,7 @@ spawnDmenuCmd :: String -> [String] -> X () spawnDmenuCmd cmd args = do name <- getMonitorName case name of - Just n -> spawnCmd cmd $ ["-m", n] ++ args + Just n -> spawnCmd cmd $ ["-m", n] ++ args Nothing -> io $ putStrLn "fail" spawnDmenuCmd' :: [String] -> X () @@ -386,7 +387,7 @@ runAppMenu :: X () runAppMenu = spawnDmenuCmd' ["-show", "drun"] runClipMenu :: X () -runClipMenu = spawnDmenuCmd' +runClipMenu = spawnDmenuCmd' [ "-modi", "\"clipboard:greenclip print\"" , "-show", "clipboard" , "-run-command", "'{cmd}'" @@ -559,7 +560,7 @@ mkNamedSubmap -> String -> [(String, NamedAction)] -> [((KeyMask, KeySym), NamedAction)] -mkNamedSubmap c sectionName bindings = +mkNamedSubmap c sectionName bindings = (subtitle sectionName:) $ mkNamedKeymap c bindings -- NOTE: the following bindings are used by dunst: