From 1e824ad9d4531f354c4efae970b184dbb4316db0 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@andyscott.me>
Date: Sun, 28 Apr 2024 07:48:43 -0400
Subject: [PATCH] Change network module for yambar 1.11

---
 dot_config/yambar/bar2.yml.tmpl   | 51 ++++++++++++++++---------------
 dot_config/yambar/config.yml.tmpl | 47 +++++++++++++++-------------
 2 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/dot_config/yambar/bar2.yml.tmpl b/dot_config/yambar/bar2.yml.tmpl
index 272ad8c..78b4f9e 100644
--- a/dot_config/yambar/bar2.yml.tmpl
+++ b/dot_config/yambar/bar2.yml.tmpl
@@ -170,41 +170,44 @@ bar:
     - label:
         content: *separator
     - network:
-        name: wlan0
-        poll-interval: 2000
         content:
           map:
-            default: {string: {text: , font: *awesome}}
+            default: {empty {}}
             conditions:
-              state == down: {string: {text: , font: *awesome, foreground: *dark_grey}}
-              state == up:
+              name >= wlan0 && name <= wlan9:
                 map:
-                  default:
-                    - string: {text: , font: *awesome}
-                    - string: {text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up"}
                   conditions:
-                    ipv4 == "":
-                      - string: {text: , font: *awesome}
-                      - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
+                    ~carrier: {empty: {}}
+                    carrier:
+                      map:
+                        default:
+                          - string: {text: , font: *awesome}
+                          - string: {text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up"}
+                        conditions:
+                          ipv4 == "":
+                            - string: {text: , font: *awesome}
+                            - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
     - network:
-        name: eth0
-        poll-interval: 2000
         content:
           map:
+            default: {empty: {}}
             conditions:
-              ~carrier: {empty: {}}
-              carrier:
+              name >= eth0 && name <= eth9:
                 map:
-                  default:
-                    - string: {text: , font: *awesome}
-                    - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
                   conditions:
-                    state == down: {string: {text: , font: *awesome}}
-                    ipv4 == "":
-                      - string: {text: , font: *awesome}
-                      - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
+                    ~carrier: {empty {}}
+                    carrier:
+                      map:
+                        default:
+                          - string: {text: , font: *awesome}
+                          - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
+                        conditions:
+                          state == down: {string: {text: , font: *awesome}}
+                          ipv4 == "":
+                            - string: {text: , font: *awesome}
+                            - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
     - label:
-       content: *separator 
+       content: *separator
 {{- end }}
     - cpu:
         poll-interval: 2000
@@ -215,7 +218,7 @@ bar:
                 - string: {text: , font: *awesome}
                 - string: {text: " {cpu}%"}
     - label:
-       content: *separator 
+       content: *separator
     - mem:
         poll-interval: 5000
         content:
diff --git a/dot_config/yambar/config.yml.tmpl b/dot_config/yambar/config.yml.tmpl
index f16febf..750c889 100644
--- a/dot_config/yambar/config.yml.tmpl
+++ b/dot_config/yambar/config.yml.tmpl
@@ -200,39 +200,42 @@ bar:
     - label:
         content: *separator
     - network:
-        name: wlan0
-        poll-interval: 2000
         content:
           map:
-            default: {string: {text: , font: *awesome}}
+            default: {empty: {}}
             conditions:
-              state == down: {string: {text: , font: *awesome, foreground: *dark_grey}}
-              state == up:
+              name >= wlan0 && name <= wlan9:
                 map:
-                  default:
-                    - string: {text: , font: *awesome}
-                    - string: {text: " {name}: {state}"}
                   conditions:
-                    ipv4 == "":
-                      - string: {text: , font: *awesome}
-                      - string: {text: " {name}: {state}"}
+                    ~carrier: {empty: {}}
+                    carrier:
+                      map:
+                        default:
+                          - string: {text: , font: *awesome}
+                          - string: {text: " {name}: {quality}%"}
+                        conditions:
+                          ipv4 == "":
+                            - string: {text: , font: *awesome}
+                            - string: {text: " {name}: {state}"}
     - network:
-        name: eth0
-        poll-interval: 2000
         content:
           map:
+            default: {empty: {}}
             conditions:
-              ~carrier: {empty: {}}
-              carrier:
+              name >= eth0 && name <= eth9:
                 map:
-                  default:
-                    - string: {text: , font: *awesome}
-                    - string: {text: " {name}: {state}"}
                   conditions:
-                    state == down: {string: {text: , font: *awesome}}
-                    ipv4 == "":
-                      - string: {text: , font: *awesome}
-                      - string: {text: " {name}: {state}"}
+                    ~carrier: {empty: {}}
+                    carrier:
+                      map:
+                        default:
+                          - string: {text: , font: *awesome}
+                          - string: {text: " {name}: {state}"}
+                        conditions:
+                          state == down: {string: {text: , font: *awesome}}
+                          ipv4 == "":
+                            - string: {text: , font: *awesome}
+                            - string: {text: " {name}: {state}"}
     - label:
         content: *separator
     - battery: