Reduced tabs from 7(?!) to 4 and cleaned up long lines

This commit is contained in:
Serĉanto de Scio 2017-03-30 13:59:51 +10:00
parent 2ba76430fc
commit 3297bebb28
No known key found for this signature in database
GPG key ID: B41FA6FF04CE4B93

View file

@ -6,45 +6,65 @@ import XMonad.Util.EZConfig(additionalKeys)
import System.IO import System.IO
main = do main = do
xmproc <- spawnPipe "/usr/bin/xmobar /home/craige/.xmobarrc" xmproc <- spawnPipe "/usr/bin/xmobar /home/craige/.xmobarrc"
-- Launch xmobar as my task bar. -- Launch xmobar as my task bar.
xmonad $ defaultConfig xmonad $ defaultConfig
{ focusFollowsMouse = False { focusFollowsMouse = False
, terminal = "terminology" , terminal = "terminology"
, manageHook = manageDocks <+> manageHook defaultConfig , manageHook = manageDocks <+> manageHook defaultConfig
, layoutHook = avoidStruts $ layoutHook defaultConfig , layoutHook = avoidStruts $ layoutHook defaultConfig
, logHook = dynamicLogWithPP $ xmobarPP , logHook = dynamicLogWithPP $ xmobarPP
{ ppOutput = hPutStrLn xmproc { ppOutput = hPutStrLn xmproc
, ppCurrent = xmobarColor "#859900" "" . wrap "[" "]" , ppCurrent = xmobarColor "#859900" "" . wrap "[" "]"
, ppVisible = xmobarColor "#2aa198" "" . wrap "(" ")" , ppVisible = xmobarColor "#2aa198" "" . wrap "(" ")"
, ppLayout = xmobarColor "#2aa198" "" , ppLayout = xmobarColor "#2aa198" ""
, ppTitle = xmobarColor "#859900" "" . shorten 50 , ppTitle = xmobarColor "#859900" "" . shorten 50
} }
, modMask = mod4Mask -- Rebind Mod to the Windows key , modMask = mod4Mask -- Rebind Mod to the Windows key
--, borderWidth = 1 --, borderWidth = 1
} `additionalKeys` } `additionalKeys`
-- Custom dmenu launcher -- Custom dmenu launcher
[ ((mod4Mask, xK_p ), spawn "exe=`dmenu_path | dmenu -fn \"Open Sans-10\" -p \"λ:\" -nb \"#073642\" -nf \"#93a1a1\" -sb \"#002b36\" -sf \"#859900\"` && eval \"exec $exe\"") [ ((mod4Mask, xK_p ), spawn
-- Lock the screen "exe=`dmenu_path | dmenu -fn \"Open Sans-10\" -p \"λ:\" -nb
, ((0, 0x1008ff2d), spawn "xscreensaver-command -lock") \"#073642\" -nf \"#93a1a1\" -sb \"#002b36\" -sf \"#859900\"` &&
-- XF86ScreenSaver eval \"exec $exe\""
, ((controlMask, xK_Print), spawn "sleep 0.2; scrot -s") )
, ((0, xK_Print), spawn "scrot") -- Lock the screen
-- Turn off the display port , ((0, 0x1008ff2d), spawn "xscreensaver-command -lock")
, ((mod4Mask, xK_d), spawn "/usr/bin/xrandr --output DP-1 --off") -- XF86ScreenSaver
-- Turn on the display port and set it as the primary display , ((controlMask, xK_Print), spawn "sleep 0.2; scrot -s")
, ((mod4Mask .|. shiftMask, xK_d), spawn "/usr/bin/xrandr --output LVDS-1 --primary --auto --output DP-1 --left-of LVDS-1 --auto") , ((0, xK_Print), spawn "scrot")
-- Turn off the HDMI port -- Turn off the display port
, ((mod4Mask .|. controlMask, xK_h), spawn "/usr/bin/xrandr --output HDMI-1 --off") , ((mod4Mask, xK_d), spawn "/usr/bin/xrandr --output DP-1 --off")
-- Turn on the HDMI port and set it as the primary display -- Turn on the display port and set it as the primary display
, ((mod4Mask .|. shiftMask, xK_h), spawn "/usr/bin/xrandr --output LVDS-1 --primary --auto --output HDMI-1 --left-of LVDS-1 --auto") , ((mod4Mask .|. shiftMask, xK_d), spawn
, ((mod4Mask, xK_v), spawn "/usr/bin/xrandr --output VGA-1 --off") "/usr/bin/xrandr --output LVDS-1 --primary --auto --output DP-1
, ((mod4Mask .|. shiftMask, xK_v), spawn "/usr/bin/xrandr --output LVDS-1 --primary --auto --output VGA-1 --left-of LVDS-1 --auto") --left-of LVDS-1 --auto"
, ((0 , 0x1008FF11), spawn "amixer set Master 2%-") -- XF86AudioLowerVolume )
, ((0 , 0x1008FF12), spawn "amixer set Master toggle") -- XF86AudioMute -- Turn off the HDMI port
, ((0 , 0x1008FF13), spawn "amixer set Master 2%+") -- XF86AudioRaiseVolume , ((mod4Mask .|. controlMask, xK_h), spawn
, ((0 , 0x1008FF14), spawn "mpc toggle") -- Play/pause "/usr/bin/xrandr --output HDMI-1 --off"
, ((0 , 0x1008FF15), spawn "mpc stop") -- Stop )
, ((0 , 0x1008FF16), spawn "mpc prev") -- XF86AudioPrevious -- Turn on the HDMI port and set it as the primary display
, ((0 , 0x1008FF17), spawn "mpc next") -- XF86AudioNext , ((mod4Mask .|. shiftMask, xK_h), spawn
] "/usr/bin/xrandr --output LVDS-1 --primary --auto --output
HDMI-1 --left-of LVDS-1 --auto"
)
-- Turn off the VGA port
, ((mod4Mask, xK_v), spawn "/usr/bin/xrandr --output VGA-1 --off")
-- Turn on the VGA port and set it as the primary display
, ((mod4Mask .|. shiftMask, xK_v), spawn
"/usr/bin/xrandr --output LVDS-1 --primary --auto --output VGA-1
--left-of LVDS-1 --auto"
)
, ((0 , 0x1008FF11), spawn
"amixer set Master 2%-") -- XF86AudioLowerVolume
, ((0 , 0x1008FF12), spawn
"amixer set Master toggle") -- XF86AudioMute
, ((0 , 0x1008FF13), spawn
"amixer set Master 2%+") -- XF86AudioRaiseVolume
, ((0 , 0x1008FF14), spawn "mpc toggle") -- Play/pause
, ((0 , 0x1008FF15), spawn "mpc stop") -- Stop
, ((0 , 0x1008FF16), spawn "mpc prev") -- XF86AudioPrevious
, ((0 , 0x1008FF17), spawn "mpc next") -- XF86AudioNext
]