xmobar-emacs tweaks

1 files changed, 27 insertions, 10 deletions

diff --git a/src/Emacs.hs b/src/Emacs.hs
index 6b00ea3..f2a9a44 100644
--- a/src/Emacs.hs
+++ b/src/Emacs.hs
@@ -1,13 +1,12 @@
 import Xmobar
 import Config
 import Monitors
-import Music (mpris, gpmd, mpdt)
 
 topProcL p = TopProc (p <~> args) 15
   where template = "<both1>  <both2>  <both3> ·  <mboth1>  <mboth2>  <mboth3>"
         args = ["-t", template, "-w", "12", "-L" , "10", "-H", "80"]
 
-diskIOS p = DiskIO [("/", "⎗<read> ⎘<write>")] (diskArgs p) 10
+diskIOS p = DiskIO [("/", "<read> <write>")] (diskArgs p) 10
 
 cpuFreq' p = CpuFreq (p <~> args) 50
   where args = ["-t" , "<avg>" , "-L", "1", "-H", "2", "-S", "Off" , "-d", "2"]
@@ -22,12 +21,28 @@ master p = Volume "default" "Master" (args ++ ("--":ext)) 10
 
 capture = Volume "default" "Capture" ["-t", "<volume>"] 10
 
+batt0 p =
+  BatteryN ["BAT0"]
+           ["-t", "<acstatus>"
+           , "-S", "Off", "-d", "0", "-m", "3"
+           , "-L", "10", "-H", "90", "-p", "3"
+           , "--low", pHigh p, "--normal", pNormal p, "--high", pLow p
+           , "--"
+           , "-P"
+           , "-a", "notify-send -u critical 'Battery running out!!!!!!'"
+           , "-A", "7"
+           , "-i", "\9211"
+           , "-O", "\129707 <left> <timeleft> <watts>"
+           , "-o", "🔋" ++ " <left> <timeleft> <watts>"
+           , "-H", "10", "-L", "7"
+           , "-h", pHigh p, "-l", pLow p] 50 "batt0"
+
 weath st p =
   WeatherX st
-           [ ("", "")
-           , ("clear", "🌣")
-           , ("sunny", fc (pHigh p) "🌣")
-           , ("fair", "🌣")
+           [ ("", "🌡")
+           , ("clear", "🔆")
+           , ("sunny", "🔆")
+           , ("fair", "🔆")
            , ("mostly clear", "🌤")
            , ("mostly sunny", "🌤")
            , ("partly sunny", "⛅")
@@ -45,16 +60,18 @@ weath st p =
            , ("light snow", "🌨")
            , ("snow", "❄")
            ]
-           (mkArgs p ["-t", "<skyConditionS> <tempC>° <weather>"
+           (mkArgs p ["-t", "<skyConditionS> <tempC>° <weather> 🌫 <windKmh>"
                      , "-L", "10", "-H", "25" , "-T", "25", "-E", ".."]
                      ["-w", ""])
            18000
 
 config p = (baseConfig p) {
   position = TopSize C 100 (defaultHeight - 2)
+  , textOutput = True
+  , textOutputFormat = Ansi
   , font = "xft:DejaVu Sans Mono-8"
   , commands = [ Run (topProcL p)
-               , Run (batt p)
+               , Run (batt0 p)
                , Run (cpu p)
                , Run (cpuFreq' p)
                , Run memory'
@@ -76,7 +93,7 @@ config p = (baseConfig p) {
              ++ " |wg-mullvad||tun0||wlp164s0wi|"
              ++ " |dynnetwork| "
              ++ "  |default:Master| 🗪 |default:Capture|"
-             ++ " |EGPH| "
+             ++ "  |EGPH|"
              ++ "{*}"
              ++ "|kbd|"
              ++ " |cpufreq|"
@@ -84,7 +101,7 @@ config p = (baseConfig p) {
              ++ " |multicoretemp|"
              ++ "   |top| "
              ++  " ␞ |memory| "
-             ++ " |diskio| 🖫|disku| " -- 📀 🖴
+             ++ " |diskio| 🖴 |disku| " -- 📀 🖴 🖫
              ++ "  |datetime| "
              ++ "|laTime| "
   }