From 7cb066dca318cfe505256f6220eded11c0552621 Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sat, 28 Oct 2023 09:51:45 +0100
Subject: Use variables to compact Yambar config

---
 .config/yambar/config.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to '.config/yambar')

diff --git a/.config/yambar/config.yml b/.config/yambar/config.yml
index 24bc750..9a291eb 100644
--- a/.config/yambar/config.yml
+++ b/.config/yambar/config.yml
@@ -1,6 +1,7 @@
 nerdfont: &nerdfont Symbols Nerd Font Mono:pixelsize=12 
 gomono: &gomono GoMono Nerd Font Mono:pixelsize=12
-bg_default: &bg_default {stack: [{background: {color: 00000000}}, {underline: {size: 3, color: 98971aff}}]}
+focused: &focused {stack: [{background: {color: 00000000}}, {underline: {size: 3, color: 98971aff}}]}
+col-inv: &col-inv {foreground: a89984ff}
 
 bar:
   font: *gomono
@@ -33,12 +34,7 @@ bar:
         map:
           conditions:
             state == focused:
-              string:
-                <<: *river_base
-                deco:
-                  stack:
-                  - background: { color: 00000000 }
-                  - underline: { size: 3, color: 98971aff }
+              { string: { <<: [*river_base, deco: *focused] }}
             state == unfocused:
               string:
                 <<: *river_base
@@ -58,15 +54,15 @@ bar:
                         empty: {}
                       conditions:
                         # 9 default tags that are shown unless occupied
-                        id == 1: { string: { <<: *river_base, foreground: a89984ff }}
-                        id == 2: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 3: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 4: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 5: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 6: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 7: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 8: { string: { <<: *river_base , foreground: a89984ff }}
-                        id == 9: { string: { <<: *river_base , foreground: a89984ff }}
+                        id == 1: { string: { <<: [*river_base, *col-inv] }}
+                        id == 2: { string: { <<: [*river_base , *col-inv] }}
+                        id == 3: { string: { <<: [*river_base , *col-inv] }}
+                        id == 4: { string: { <<: [*river_base , *col-inv] }}
+                        id == 5: { string: { <<: [*river_base , *col-inv] }}
+                        id == 6: { string: { <<: [*river_base , *col-inv] }}
+                        id == 7: { string: { <<: [*river_base , *col-inv] }}
+                        id == 8: { string: { <<: [*river_base , *col-inv] }}
+                        id == 9: { string: { <<: [*river_base , *col-inv] }}
   center:
     - script:
         path: ~/.config/yambar/scripts/dater.sh
-- 
cgit v1.2.3