From ef03721112c3ea1049e74349ced04041d034d57b Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 1 Mar 2020 18:24:39 +0000
Subject: protonvn new gen calls its interface proton0

---
 src/TopC.hs         | 6 ++++--
 src/lib/Bottom.hs   | 4 ++--
 src/lib/Monitors.hs | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/TopC.hs b/src/TopC.hs
index a7ecf9d..4941adb 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -33,6 +33,7 @@ config p = (baseConfig p) {
   , alpha = 255
   , commands = [ Run (topProcL p)
                , Run m
+--               , Run (mail p)
                , Run (cpuBars p)
                , Run memory
                , Run (diskU p)
@@ -42,7 +43,7 @@ config p = (baseConfig p) {
                , Run (batt p)
                , Run (wireless p "wlp1s0")
                , Run (dynNetwork p)
-               , Run tun0
+               , Run proton0
                , Run w -- LEGE, LEBL, KCV0
                , Run masterVol
                , Run captureVol
@@ -51,8 +52,9 @@ config p = (baseConfig p) {
                ]
   , template = " |batt0| "
              ++ "|bright| "
-             ++ "<action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> "
+             ++ "<action=`toggle-app.sh nm-applet`>|proton0||wlp1s0wi|</action> "
              ++ "|dynnetwork| "
+--             ++ "|mail| "
              ++ "<action=`toggle-app.sh pasystray`>|default:Master| \
                  \|default:Capture|</action> "
              ++ "<action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ ma ++ "|</action>"
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index 7f58efe..e4302ab 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -13,7 +13,7 @@ config cs tpl p = (baseConfig p) {
                    defaultHeight - 7]
   , border = TopB
   , template = "|tray| \
-               \<action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> \
+               \<action=`toggle-app.sh nm-applet`>|proton0||wlp1s0wi|</action> \
                \ |dynnetwork| \
                \ <action=`toggle-app.sh pasystray`>|default:Master|\
                \ |default:Capture|</action>  <fn=2>🎵</fn>"
@@ -23,7 +23,7 @@ config cs tpl p = (baseConfig p) {
   , commands = [ Run (uptime p)
                , Run (wireless p "wlp1s0")
                , Run (dynNetwork p)
-               , Run tun0
+               , Run proton0
                , Run (weather "EGPH" p) -- LEGE, LEBL, KCV0
                , Run trayPadding
                , Run (mail p)
diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index 1a8d0d6..ff27dd8 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -91,7 +91,8 @@ weather' tmp st p =
            , ("partly cloudy", fn 3 "⛅")
            , ("mostly cloudy", fn 3 "☁")
            , ("considerable cloudiness", fn 4 "⛈")]
-           (mkArgs p ["-t", tmp , "-L","10", "-H", "25"] ["-w", ""])
+           (mkArgs p ["-t", tmp , "-L","10", "-H", "25"]
+                     ["-w", "", "-m", "False"])
            18000
 
 weather = weather' "<skyConditionS> <tempC>° <rh>% <windKmh> (<hour>)"
@@ -162,7 +163,7 @@ mail p = MailX [ ("I", "jao/inbox", pHigh p)
                , ("B", "bigml/inbox", pHigh p)
                , ("S", "bigml/support", "")
                ]
-               ["-d", "~/var/maildir", "-p", " ", "-s", " "]
+               ["-d", "~/var/mail", "-p", " ", "-s", " "]
                "mail"
 
 masterVol =
@@ -181,7 +182,8 @@ brightness' = Brightness ["--", "-D", "amdgpu_bl0", "-C", "brightness"] 10
 
 memory = Memory ["-t","<available> M", "-p", "2", "-W", "7"] 20
 
-tun0 = Network "tun0" ["-t", "<dev>:", "-x", ""] 20
+netdev name = Network name ["-t", "<up>", "-x", "", "--", "--up", "+"] 20
+proton0 = netdev "proton0"
 
 laTime = DateZone "%H" "en_US" "US/Pacific" "laTime" 10
 localTime = Date "%R" "datetime" 10
-- 
cgit v1.2.3