1 files changed, 60 insertions, 18 deletions

diff --git a/xmobar/xmobar.hs b/xmobar/xmobar.hs
index 29eac0c..1bd7e22 100644
--- a/xmobar/xmobar.hs
+++ b/xmobar/xmobar.hs
@@ -1,34 +1,76 @@
 import Xmobar
 
+green, red, blue, blue2, purple, yellow, orange, lowWhite, white :: String
+green = "#b8bb26"
+red = "#fb4934"
+blue = "#83a598"
+blue2 = "#458588"
+purple = "#d3869b"
+yellow = "#fabd2f"
+orange = "#fe8019"
+lowWhite = "#a89984"
+white    = "#ebdbb2"
+
 config :: Config
 config = 
   defaultConfig
     { overrideRedirect = False
-      , font     = "xft:JetBrains Mono NF:style=medium:size=9"
+      , font     = "xft:JetBrains Mono NF:style=medium:size=10"
       , bgColor  = "#3c3836"
       , fgColor  = "#ebdbb2"
-      , position = TopW L 120
-      , commands = [ Run $ Cpu
-                       [ "-L", "30"
-                       , "-H", "70"
-                       , "--high"  , "#fb4934"
-                       , "--normal", "#fabd2f"
-                       ] 10
+      , position = Top
+      , commands = [ Run $ Cpu ["--template", "\63521 <total>%"
+                      , "-L", "30"
+                      , "-H", "70"
+                      , "--high", red
+                      , "--normal", yellow
+                      ] 10
                    , Run $ Alsa "default" "Master"
-                       [ "--template", "<volumestatus>"
-                       , "--suffix"  , "True"
-                       , "--"
-                       , "--on", ""
-                       ]
-                   , Run $ Memory ["--template", "Mem: <usedratio>%"] 10
-                   , Run $ Swap [] 10
-                   , Run $ Date "%a %D <fc=#458588>%I:%M %p</fc>" "date" 10
+                      [ "--template", "墳 <volume><status>"
+                      , "--suffix", "True"
+                      , "--"
+                      , "--on", ""
+                      , "--off", "/mute"
+                      , "-c", red
+                      ]
+                   , Run $ Memory ["--template", "\57958 <usedratio>%"
+                     , "--High", "60"
+                     , "--high", orange
+                     ] 10
+                   , Run $ Swap ["--template", concat ["<fc=", lowWhite, ">[<usedratio>%]</fc>"]
+                     , "--High", "0"
+                     , "--high", orange
+                     ] 10
+                   , Run $ Date (concat ["\62956 <fc=", purple, ">%a</fc> %D <fc=", blue2, ">%I:%M %p</fc>"]) "date" 10
+                   , Run $ DynNetwork [ "--template", (concat ["\62722 <dev>: <tx>kB<fc=", lowWhite, ">tx</fc> <rx><fc=", white, ">kB</fc><fc=", lowWhite, ">rx</fc>"])
+                      , "--Low", "5000"       -- units: B/s
+                      , "--High", "100000"       -- units: B/s
+                      , "--low", green
+                      , "--normal", orange
+                      , "--high", red
+                      ] 10
+                   , Run $ Battery [ "--template", "\62840 <acstatus>"
+                      , "--Low", "20"        -- units: %
+                      , "--High", "80"        -- units: %
+                      , "--low", red
+                      , "--normal", green
+                      , "--high", blue
+
+                      , "--" -- battery specific options
+                        -- discharging status
+                        , "-o", "<left>% (<timeleft>)"
+                        -- AC "on" status
+                        , "-O", "<fc=#dAA520>+<left>%</fc>"
+                        -- charged status
+                        , "-i", "<fc=#006000>Charged</fc>"
+                      ] 50
+                   , Run $ Com "brightness" [] "" 10
                    , Run XMonadLog
                    ]
       , sepChar  = "%"
       , alignSep = "}{"
-      , template = "%XMonadLog% }{ %alsa:default:Master% | %cpu% | %memory% * %swap% | %date% "
-      }
+      , template = " %XMonadLog% }{%alsa:default:Master%|\62941 %brightness%|%battery%|%dynnetwork%|%cpu%|%memory%%swap%|%date% "
+    }
 
 main :: IO()
 main = xmobar config