Overhaul for hidpi laptop

dot_config/yambar/config.yml

@@ -1,8 +1,6 @@
-hack: &hack Hack:pixelsize=10
-awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
 .everforest:
   0:  &foreground   d8caacff
-  1:  &background   323d43ff
+  1:  &background   323d43cc
   2:  &black        4a555bff
   3:  &dark_grey    525c62ff
   4:  &dark_red     e26c6eff
@@ -19,84 +17,179 @@ awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
   15: &cyan         83c092ff
   16: &light_grey   d0bf9bff
   17: &white        d8caacff
+hack: &hack Hack:pixelsize=28
+awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=26
+separator: &separator {string: {text: " | ", font: *hack, foreground: *light_grey}}
 
 bar:
-  monitor: DP-2
+  height: 72
-  height: 26
   location: bottom
   layer: top
   spacing: 2
   margin: 2
-  font: Hack:pixelsize=10
+  font: *hack
   foreground: *foreground
   background: *background
   border:
-    width: 1
+    top-width: 0
-    color: *dark_cyan
+    bottom-width: 4
-    margin: 2
+    left-width: 0
+    right-width: 0
+    color: *light_grey
+    margin: 0
 
   left:
     - river:
         anchors:
           - base: &river_base
-              margin: 10
+              left-margin: 56
+              right-margin: 56
               text: "{id}"
-              on-click: sh -c 'riverctl set-focused-tags $((1 << ({id} - 1)))'
-
         content:
           map:
-            on-click: sh -c 'riverctl set-focused-tags $((1 << ({id} - 1)))'
+            on-click:
+              left: sh -c "riverctl set-focused-tags $((1 << ({id} - 1)))"
+              middle: sh -c "riverctl toggle-view-tags $((1 << ({id} -1)))"
+              right: sh -c "riverctl toggle-focused-tags $((1 << ({id} -1)))"
             conditions:
               urgent:
                 string:
                   <<: *river_base
-                  deco: {background: {color: *dark_red}}
+                  deco: {stack: [{background: {color: *dark_red}}, {underline: {size: 4, color: *black}}]}
+                  foreground: *black
               focused:
                 string:
                   <<: *river_base
-                  deco: {background: {color: *dark_cyan}}
+                  deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 4, color: *dark_grey}}]}
+                  foreground: *dark_grey
               ~focused && occupied:
                 string:
                   <<: *river_base
-                  deco: {background: {color: *light_grey}}
+                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 4, color: *light_grey}}]}
+                  foreground: *light_grey
               visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {background: {color: *dark_green}}
+                  deco: {background: {color: *light_grey}}
+                  foreground: *dark_grey
               visible && ~occupied:
                 string:
                   <<: *river_base
-                  deco: {background: {color: *dark_blue}}
+                  deco: {background: {color: *dark_grey}}
+                  foreground: *light_grey
               ~visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {background: {color: *dark_grey}}
+                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 4, color: *light_grey}}]}
-              ~visible && ~occupied: {empty: {}}
+                  foreground: *light_grey
+              id < 10 && ~visible && ~occupied:
+                string:
+                  <<: *river_base
+                  foreground: *light_grey
+              id >= 10 && ~visible && ~occupied: {empty: {}}
               ~focused:
                 string:
                   <<: *river_base
+                  foreground: *light_grey
+
+  center:
+    - foreign-toplevel:
+        content:
+          map:
+            conditions:
+              activated:
+                - string: {text: "{app-id}: {title}"}
+              ~activated: {empty: {}}
 
   right:
+    - pulse:
+        content:
+          map:
+            conditions:
+              sink_muted:
+                - string: {text: , font: *awesome}
+                - string: {text: " {sink_percent}% ({sink_port})"}
+              ~sink_muted:
+                - ramp:
+                    tag: sink_percent
+                    items:
+                      - string: {text: , font: *awesome}
+                      - string: {text: , font: *awesome}
+                      - string: {text: , font: *awesome}
+                - string: {text: " {sink_percent}% ({sink_port})"}
+    - label:
+        content: *separator
+    - backlight:
+        name: amdgpu_bl0
+        content:
+          - ramp:
+              tag: percent
+              items:
+                - string: {text: , font: *awesome}
+                - string: {text: , font: *awesome}
+          - string: {text: " {percent}%"}
+    - label:
+        content: *separator
     - network:
         name: wlan0
         poll-interval: 1000
         content:
           map:
-              default: {string: {text: , font: *awesome, foreground: *black}}
+            default: {string: {text: , font: *awesome}}
             conditions:
-                state == down: {string: {text: , font: *awesome, foreground: *red}}
+              state == down: {string: {text: , font: *awesome, foreground: *dark_grey}}
               state == up:
                 map:
                   default:
                     - string: {text: , font: *awesome}
-                      - string: {text: "{ssid} {dl-speed:mb}/{ul-speed:mb} Mb/s"}
+                    - string: {text: " {name}: {state}"}
+                      #- string: {text: " {ssid} {dl-speed:mb}/{ul-speed:mb} Mb/s", foreground: *light_grey}
                   conditions:
                     ipv4 == "":
-                        - string: {text: , font: *awesome, foreground: *black}
+                      - string: {text: , font: *awesome}
-                        - string: {text: "{ssid} {dl-speed:mb}/{ul-speed:mb} Mb/s", foreground: *black}
+                      - string: {text: " {name}: {state}"}
+                        #- string: {text: " {ssid} {dl-speed:mb}/{ul-speed:mb} Mb/s", foreground: *light_grey}
+    - label:
+        content: *separator
+    - battery:
+        name: BAT0
+        poll-interval: 10
+        anchors:
+          discharging: &discharging
+            list:
+              items:
+                - ramp:
+                    tag: capacity
+                    items:
+                      - string: {text: , foreground: *dark_red, font: *awesome}
+                      - string: {text: , foreground: *dark_yellow, font: *awesome}
+                      - string: {text: , font: *awesome}
+                      - string: {text: , font: *awesome}
+                      - string: {text: , font: *awesome}
+                - string: {text: " {capacity}% {estimate}"}
+        content:
+          map:
+            conditions:
+              state == unknown:
+                <<: *discharging
+              state == discharging:
+                <<: *discharging
+              state == charging:
+                - string: {text: , font: *awesome}
+                - string: {text: " {capacity}% {estimate}"}
+              state == full:
+                - string: {text: , foreground: *dark_green, font: *awesome}
+                - string: {text: " {capacity}% full", foreground: *dark_green}
+              state == "not charging":
+                - string: {text:  , font: *awesome}
+                - string: {text: " {capacity}%"}
+    - label:
+        content: *separator
     - clock:
+        date-format: "%Y-%m-%d"
+        time-format: "%R"
         content:
           - string: {text: , font: *awesome}
-            - string: {text: "{date}", right-margin: 5}
+          - string: {text: " {date} | "}
           - string: {text: , font: *awesome}
           - string: {text: " {time} "}