Merge branch 'master' of sabaki.qlic.orbekk.com:/storage/projects/dotfiles

2 files changed, 21 insertions, 113 deletions

diff --git a/xmonad/xmobar.hs b/xmonad/xmobar.hs
index a1a68d3..e719488 100644
--- a/xmonad/xmobar.hs
+++ b/xmonad/xmobar.hs
@@ -11,6 +11,9 @@ Config { font = "xft:Source Code Pro:size=8:bold:antialias=true" -- "-*-Fixed-Bo
                      ["-t", "<fc=lightblue>NYC</fc> <tempC>°C <skyCondition> <rh>%"
                      , "-L", "15", "-H", "25", "--normal", "green"
                      , "--high", "red", "--low", "lightblue"] 36000
+ 	 , Run MPD ["-t",
+          "<artist> - <title> <track>/<plength> <statei> [<flags>]",
+          "--", "-P", ">>", "-Z", "|", "-S", "><"] 30
          , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10
          , Run Volume "default" "Master" [
                 "-t", "♪ <volume> <status>"] 10
@@ -47,111 +50,5 @@ Config { font = "xft:Source Code Pro:size=8:bold:antialias=true" -- "-*-Fixed-Bo
          ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = "%StdinReader% }{ %default:Master%   %bright%   %battery%   %disku% %date%   %KNYC%"
+       , template = "%StdinReader% }{ %mpd%   %default:Master%   %bright%   %battery%   %disku% %date%   %KNYC%"
        }
-
--- Config {
--- 
---    -- appearance
---      font =         "xft:Source Code Pro:size=9:bold:antialias=true"
---    , bgColor =      "black"
---    , fgColor =      "#646464"
---    , position =     Top
---    , border =       BottomB
---    , borderColor =  "#646464"
--- 
---    -- layout
---    , sepChar =  "%"   -- delineator between plugin names and straight text
---    , alignSep = "}{"  -- separator between left-right alignment
---    , template = "%StdinReader% | %battery% | %multicpu% | %coretemp% | %memory% | %dynnetwork% }{ %RJTT% | %date% || %kbd% "
--- 
---    -- general behavior
---    , lowerOnStart =     True    -- send to bottom of window stack on start
---    , hideOnStart =      False   -- start with window unmapped (hidden)
---    , allDesktops =      True    -- show on all desktops
---    , overrideRedirect = False   -- set the Override Redirect flag (Xlib)
---    , pickBroadest =     False   -- choose widest display (multi-monitor)
---    , persistent =       True    -- enable/disable hiding (True = disabled)
--- 
---    -- plugins
---    --   Numbers can be automatically colored according to their value. xmobar
---    --   decides color based on a three-tier/two-cutoff system, controlled by
---    --   command options:
---    --     --Low sets the low cutoff
---    --     --High sets the high cutoff
---    --
---    --     --low sets the color below --Low cutoff
---    --     --normal sets the color between --Low and --High cutoffs
---    --     --High sets the color above --High cutoff
---    --
---    --   The --template option controls how the plugin is displayed. Text
---    --   color can be set by enclosing in <fc></fc> tags. For more details
---    --   see http://projects.haskell.org/xmobar/#system-monitor-plugins.
---    , commands = 
---         -- weather monitor
---         [ Run Weather "RJTT" [ "--template", "<skyCondition> | <fc=#4682B4><tempC></fc>°C | <fc=#4682B4><rh></fc>% | <fc=#4682B4><pressure></fc>hPa"
---                              ] 36000
--- 
---         -- network activity monitor (dynamic interface resolution)
---         , Run DynNetwork     [ "--template" , "<dev>: <tx>kB/s|<rx>kB/s"
---                              , "--Low"      , "1000"       -- units: kB/s
---                              , "--High"     , "5000"       -- units: kB/s
---                              , "--low"      , "darkgreen"
---                              , "--normal"   , "darkorange"
---                              , "--high"     , "darkred"
---                              ] 10
--- 
---         -- cpu activity monitor
---         , Run MultiCpu       [ "--template" , "Cpu: <total0>%|<total1>%"
---                              , "--Low"      , "50"         -- units: %
---                              , "--High"     , "85"         -- units: %
---                              , "--low"      , "darkgreen"
---                              , "--normal"   , "darkorange"
---                              , "--high"     , "darkred"
---                              ] 10
--- 
---         -- cpu core temperature monitor
---         , Run CoreTemp       [ "--template" , "Temp: <core0>°C|<core1>°C"
---                              , "--Low"      , "70"        -- units: °C
---                              , "--High"     , "80"        -- units: °C
---                              , "--low"      , "darkgreen"
---                              , "--normal"   , "darkorange"
---                              , "--high"     , "darkred"
---                              ] 50
---                           
---         -- memory usage monitor
---         , Run Memory         [ "--template" ,"Mem: <usedratio>%"
---                              , "--Low"      , "20"        -- units: %
---                              , "--High"     , "90"        -- units: %
---                              , "--low"      , "darkgreen"
---                              , "--normal"   , "darkorange"
---                              , "--high"     , "darkred"
---                              ] 10
--- 
---         -- battery monitor
---         , Run Battery        [ "--template" , "Batt: <acstatus>"
---                              , "--Low"      , "10"        -- units: %
---                              , "--High"     , "80"        -- units: %
---                              , "--low"      , "darkred"
---                              , "--normal"   , "darkorange"
---                              , "--high"     , "darkgreen"
--- 
---                              , "--" -- battery specific options
---                                        -- discharging status
---                                        , "-o"	, "<left>% (<timeleft>)"
---                                        -- AC "on" status
---                                        , "-O"	, "<fc=#dAA520>Charging</fc>"
---                                        -- charged status
---                                        , "-i"	, "<fc=#006000>Charged</fc>"
---                              ] 50
--- 
---         -- time and date indicator 
---         --   (%F = y-m-d date, %a = day of week, %T = h:m:s time)
---         , Run Date           "<fc=#ABABAB>%F (%a) %T</fc>" "date" 10
--- 
---         -- keyboard layout indicator
---         , Run Kbd            [ ("us(dvorak)" , "<fc=#00008B>DV</fc>")
---                              , ("us"         , "<fc=#8B0000>US</fc>")
---                              ]
---         ]
---     }
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index b64dbb7..6b8e0f3 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -22,9 +22,14 @@ myConfig =
     , modMask = mod4Mask
     , terminal = "$TERMINAL"
     , borderWidth = 2
-    , workspaces = pure <$> "\"<>PYAOEU"
+    , normalBorderColor = "#000000"
+    , workspaces = pure <$> "\"<>PYFAOEU"
     }
 
+muteCommand = "pactl set-sink-mute @DEFAULT_SINK@ toggle"
+increaseVolumeCommand = "sh -c \"pactl set-sink-mute 0 false ; pactl set-sink-volume @DEFAULT_SINK@ +5%\""
+decreaseVolumeCommand = "sh -c \"pactl set-sink-mute 0 false ; pactl set-sink-volume @DEFAULT_SINK@ -- -5%\""
+
 myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
 
     -- launch a terminal
@@ -83,6 +88,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     -- , ((modm              , xK_period), sendMessage (IncMasterN (-1)))
     , ((modm .|. shiftMask, xK_Tab ), sendMessage (IncMasterN (-1)))
 
+    , ((modm              , xK_w ), spawn muteCommand)
+    , ((modm              , xK_v ), spawn decreaseVolumeCommand)
+    , ((modm              , xK_z ), spawn increaseVolumeCommand)
+
     -- This is redundant because it's added by the statusBar function.
     -- , ((modm              , xK_b     ), sendMessage ToggleStruts)
 
@@ -101,10 +110,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     -- mod-[1..9], Switch to workspace N
     -- mod-shift-[1..9], Move client to workspace N
     --
-    [((m .|. modm, k), windows $ f i)
-        | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
-        , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
-    ++
+    -- [((m .|. modm, k), windows $ f i)
+    --     | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
+    --     , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
+    -- ++
 
     [((m .|. modm, k), windows $ f i)
         | (i, k) <- zip (XMonad.workspaces conf) [
@@ -113,10 +122,12 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
                     , xK_period
                     , xK_p
                     , xK_y
+                    , xK_f
                     , xK_a
                     , xK_o
                     , xK_e
-                    , xK_u]
+                    , xK_u
+                    , xK_i]
         , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
     ++