1 files changed, 11 insertions, 70 deletions
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index 087ba97..f6c474d 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -2,90 +2,31 @@ module Bottom (config) where
 
 import Xmobar
 import Config
-
-uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S"
-                         , "On" , "-L", "10", "-H", "100"]) 600
-
-weather st =
-  Weather st ["-t", "<tempC>° <rh>%  <windKmh> <skyCondition> (<hour>)"
-             , "-L","10", "-H", "25", "--normal", "black",
-               "--high", "lightgoldenrod4", "--low", "darkseagreen4"] 18000
-
-batt p =
-  BatteryN ["BAT0"]
-           ((p <~> ["-t", "<left>%<acstatus>"
-                   , "-S", "Off", "-d", "0", "-m", "3"
-                   , "-L", "10", "-H", "80", "-p", "3"])
-            ++ [ "--"
-               , "-i", "", "-O", " <timeleft> <watts>"
-               , "-o", " <timeleft> <watts>"
-               , "-H", "16", "-L", "10"
-               , "-h", "sienna4", "-l", "gray20"]) 50 "b0"
-
-coreTemp p =
-  CoreTemp (p <~> ["-t", "<core1>° <core2>°"
-                  , "-L", "50", "-H", "75", "-d", "0"]) 50
-
-diskU p =
-  DiskU [("dm-1", "<used>") , ("/media/sdb", " s <used>")]
-        (p <~> ["-L", "20", "-H", "70", "-m", "1", "-p", "3"])
-        20
-
-diskIO p =
-  DiskIO [("dm-1", "↑ <read> ↓ <write>")]
-         (p <~> ["-L", "20", "-H", "5000", "-m", "5", "-p", "3"]) 10
-
-mbox = MBox [ ("I", "inbox", "darkseagreen4")
-            , ("B", "bigml.spool", "sienna4")
-            , ("S", "bigsup.spool", "sienna4")
-            , ("b", "bugml.spool", "sienna4")
-            , ("G", "geiser.spool", "darkseagreen4")
-            , ("X", "xmobar.spool", "darkseagreen4")
-            , ("g", "gnu.spool", "")
-            , ("k", "books.spool", "")
-            , ("h", "hacking.spool", "")
-            , ("c", "computers.spool", "")
-            , ("w", "words.spool", "")
-            , ("t", "think.spool", "")
-            ] ["-d", "/home/jao/var/mail", "-p", " ", "-s", ""] "mbox"
-
-
-masterVol =
-  Volume "default" "Master"
-                  ["-t", "<status> <volume>"
-                  , "--", "-C", "black", "-c", "sienna4", "-O", ""
-                  , "-o", " ×"] 10
-
-captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
-
-kbd = Kbd [("us", ""), ("us(intl)", "*")]
-
-brightness = Brightness ["--", "-D", "intel_backlight"] 10
-
-memory = Memory ["-t","<available> M", "-p", "2"] 20
+import Monitors
 
 config cs tpl p = (baseConfig p) {
   position = BottomSize C 100 defaultHeight
   , textOffset = defaultHeight - 6
   , textOffsets = [defaultHeight - 5]
   , border = TopB
-  , template = "|tray||kbd||default:Master| |default:Capture| "
+  , template = "|tray| \
+               \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \
+               \|dynnetwork| \
+               \|default:Master| |default:Capture| "
              ++ tpl
              ++ " {} |mbox| |EGPH| \
-                \|diskio| |disku| · |bright| · |coretemp| \
-                \|memory| · |uptime| |b0| "
+                \ |bright| \
+                \|uptime| |b0| "
   , commands = [ Run (uptime p)
                , Run brightness
+               , Run (wireless p)
+               , Run (dynNetwork p)
+               , Run tun0
                , Run (weather "EGPH") -- LEGE, LEBL, KCV0
-               , Run (Com "padding-icon.sh" [] "tray" 20)
-               , Run memory
+               , Run trayPadding
                , Run (batt p)
-               , Run (coreTemp p)
-               , Run (diskU p)
-               , Run (diskIO p)
                , Run mbox
                , Run masterVol
                , Run captureVol
-               , Run kbd
                ] ++ cs
 }