1 files changed, 19 insertions(+), 24 deletions(-)

M yambar/config.yml

@@ 19,59 19,54 @@ bar:
 
       content:
         map:
-          tag: state
-          values:
-            focused:
+          conditions:
+            state == focused:
               string:
                 <<: *river_base
                 deco:
                   stack:
                   - background: { color: 599bf6ff }
                   - underline: { size: 2, color: fefefeff }
-
-            unfocused:
+            state == unfocused:
               string:
                 <<: *river_base
-            invisible:
+            state == invisible:
               map:
-                tag: occupied
-                values:
-                  true:
+                conditions:
+                  occupied:
                     string:
                       <<: *river_base
                       deco:
                         stack:
                         - underline: { size: 2, color: fefefeff }
-                  false:
+                  ~occupied:
                     map:
-                      tag: id
                       default:
                         empty: {}
-                      values:
+                      conditions:
                         # 9 default tags that are shown unless occupied
-                        1: { string: { <<: *river_base }}
-                        2: { string: { <<: *river_base }}
-                        3: { string: { <<: *river_base }}
-                        4: { string: { <<: *river_base }}
-                        5: { string: { <<: *river_base }}
-                        6: { string: { <<: *river_base }}
-                        7: { string: { <<: *river_base }}
-                        8: { string: { <<: *river_base }}
-                        9: { string: { <<: *river_base }}
+                        id == 1: { string: { <<: *river_base }}
+                        id == 2: { string: { <<: *river_base }}
+                        id == 3: { string: { <<: *river_base }}
+                        id == 4: { string: { <<: *river_base }}
+                        id == 5: { string: { <<: *river_base }}
+                        id == 6: { string: { <<: *river_base }}
+                        id == 7: { string: { <<: *river_base }}
+                        id == 8: { string: { <<: *river_base }}
+                        id == 9: { string: { <<: *river_base }}
   right:
   - script:
       path: /usr/bin/env
       args: [yambar-irc]
       content:
         map:
-          tag: count
           default:
             string:
               on-click: yambar-irc clear
               margin: 12
               text: "IRC highlights: {count}"
-          values:
-            0:
+          conditions:
+            count == 0:
                empty: {}
   - clock:
       date-format: "%F"