From 09617e0d62c5a8d929294abd58b413f33e7ddfd8 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sat, 14 Sep 2024 10:48:29 -0400 Subject: [PATCH] yambar: switch colors to catppuccin mocha, various deco updates --- dot_config/yambar/bar2.yml.tmpl | 186 ++++++++++++++++++------- dot_config/yambar/config.yml.tmpl | 224 +++++++++++++++++++++++------- 2 files changed, 310 insertions(+), 100 deletions(-) diff --git a/dot_config/yambar/bar2.yml.tmpl b/dot_config/yambar/bar2.yml.tmpl index 3a710e3..273a783 100644 --- a/dot_config/yambar/bar2.yml.tmpl +++ b/dot_config/yambar/bar2.yml.tmpl @@ -1,25 +1,46 @@ # Colors -.everforest: - 0: &foreground d8caacff - 1: &background 323d43dd - 2: &black 4a555bff - 3: &dark_grey 525c62ff - 4: &dark_red e26c6eff - 5: &red e68183ff - 6: &dark_green 9bb86fff - 7: &green a7c080ff - 8: &dark_yellow d5b26bff - 9: &yellow dbbc7fff - 10: &dark_blue 6eb2a9ff - 11: &blue 7fbbb3ff - 12: &dark_magenta cf87a9ff - 13: &magenta d699b6ff - 14: &dark_cyan 72b783ff - 15: &cyan 83c092ff - 16: &light_grey d0bf9bff - 17: &white d8caacff -transparent_light_grey: &transparent_light_grey d0bf9b99 -transparent_black: &transparent_black 4a555b99 +.catppuccin_mocha: + 0: &foreground cdd6f4ff + 1: &background 1e1e2edd + 2: &black 45475aff + 3: &dark_grey 45475aff + 4: &dark_red f38ba8ff + 5: &red f38ba8ff + 6: &dark_green a6e3a1ff + 7: &green a6e3a1ff + 8: &dark_yellow f9e2afff + 9: &yellow f9e2afff + 10: &dark_blue 89b4faff + 11: &blue 89b4faff + 12: &dark_magenta f5c2e7ff + 13: &magenta f5c2e7ff + 14: &dark_cyan 94e2d5ff + 15: &cyan 94e2d5ff + 16: &light_grey bac2deff + 17: &white a6adc8ff +transparent_light_grey: &transparent_light_grey bac2deaa +transparent_black: &transparent_black 45475aaa +# .everforest: +# 0: &foreground d8caacff +# 1: &background 323d43dd +# 2: &black 4a555bff +# 3: &dark_grey 525c62ff +# 4: &dark_red e26c6eff +# 5: &red e68183ff +# 6: &dark_green 9bb86fff +# 7: &green a7c080ff +# 8: &dark_yellow d5b26bff +# 9: &yellow dbbc7fff +# 10: &dark_blue 6eb2a9ff +# 11: &blue 7fbbb3ff +# 12: &dark_magenta cf87a9ff +# 13: &magenta d699b6ff +# 14: &dark_cyan 72b783ff +# 15: &cyan 83c092ff +# 16: &light_grey d0bf9bff +# 17: &white d8caacff +# transparent_light_grey: &transparent_light_grey d0bf9b99 +# transparent_black: &transparent_black 4a555b99 # Fonts {{- if eq .chezmoi.hostname "helix" }} hack: &hack Hack:pixelsize=28 @@ -29,7 +50,8 @@ hack: &hack Hack:pixelsize=13 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12 {{- end }} # Labels -separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}} +separator: + &separator { string: { text: " ", font: *hack, foreground: *light_grey } } bar: {{- if eq .chezmoi.hostname "helix" }} @@ -122,39 +144,88 @@ bar: urgent: string: <<: *river_base - deco: {stack: [{background: {color: *dark_red}}, {border: {size: 2, color: *black}}]} + deco: + { + stack: + [ + { background: { color: *dark_red } }, + { border: { size: 2, color: *black } }, + ], + } foreground: *black focused: string: <<: *river_base - deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 1, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *dark_grey visible && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *transparent_light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *light_grey visible && ~occupied: string: <<: *river_base - deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *transparent_light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *light_grey ~visible && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]} + deco: + { + stack: + [ + { background: { color: *dark_grey } }, + { + underline: + { size: 1, color: *transparent_light_grey }, + }, + ], + } foreground: *light_grey ~focused && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]} + deco: + { + stack: + [ + { background: { color: *dark_grey } }, + { + underline: + { size: 1, color: *transparent_light_grey }, + }, + ], + } foreground: *light_grey id < 10 && ~visible && ~occupied: string: <<: *river_base - deco: {underline: {size: 1, color: *transparent_light_grey}} + deco: + { underline: { size: 1, color: *transparent_light_grey } } foreground: *light_grey - id >= 10 && ~visible && ~occupied: {empty: {}} + id >= 10 && ~visible && ~occupied: { empty: {} } {{ end }} center: - foreign-toplevel: @@ -162,8 +233,8 @@ bar: map: conditions: activated: - - string: {text: "{app-id}: {title}"} - ~activated: {empty: {}} + - string: { text: "{app-id}: {title}" } + ~activated: { empty: {} } right: {{- if eq .chezmoi.hostname "hydrus" }} @@ -172,42 +243,54 @@ bar: - network: content: map: - default: {empty: {}} + default: { empty: {} } conditions: name >= wlan0 && name <= wlan9: map: conditions: - ~carrier: {empty: {}} + ~carrier: { empty: {} } carrier: map: default: - - string: {text: , font: *awesome} - - string: {text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up"} + - 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"} + - string: { text: , font: *awesome } + - string: + { + text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up", + } - network: content: map: - default: {empty: {}} + default: { empty: {} } conditions: name >= eth0 && name <= eth9: map: conditions: - ~carrier: {empty: {}} + ~carrier: { empty: {} } carrier: map: default: - - string: {text: , font: *awesome} - - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"} + - 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}} + 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"} + - 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,13 +298,12 @@ bar: map: conditions: id == -1: - - string: {text: , font: *awesome} - - string: {text: " {cpu}%"} + - string: { text: , font: *awesome } + - string: { text: " {cpu}%" } - label: - content: *separator + content: *separator - mem: poll-interval: 5000 content: - - string: {text: , font: *awesome} - - string: {text: " {used:mb} MiB ({percent_used}% Used)"} - + - string: { text: , font: *awesome } + - string: { text: " {used:mb} MiB ({percent_used}% Used)" } diff --git a/dot_config/yambar/config.yml.tmpl b/dot_config/yambar/config.yml.tmpl index 782fbe6..742cc82 100644 --- a/dot_config/yambar/config.yml.tmpl +++ b/dot_config/yambar/config.yml.tmpl @@ -1,25 +1,46 @@ # Colors -.everforest: - 0: &foreground d3c6aaff - 1: &background 272e33dd - 2: &black 4a555bff - 3: &dark_grey 525c62ff - 4: &dark_red e26c6eff - 5: &red e68183ff - 6: &dark_green 9bb86fff - 7: &green a7c080ff - 8: &dark_yellow d5b26bff - 9: &yellow dbbc7fff - 10: &dark_blue 6eb2a9ff - 11: &blue 7fbbb3ff - 12: &dark_magenta cf87a9ff - 13: &magenta d699b6ff - 14: &dark_cyan 72b783ff - 15: &cyan 83c092ff - 16: &light_grey d0bf9bff - 17: &white d8caacff -transparent_light_grey: &transparent_light_grey d0bf9baa -transparent_black: &transparent_black 4a555baa +.catppuccin_mocha: + 0: &foreground cdd6f4ff + 1: &background 1e1e2edd + 2: &black 45475aff + 3: &dark_grey 45475aff + 4: &dark_red f38ba8ff + 5: &red f38ba8ff + 6: &dark_green a6e3a1ff + 7: &green a6e3a1ff + 8: &dark_yellow f9e2afff + 9: &yellow f9e2afff + 10: &dark_blue 89b4faff + 11: &blue 89b4faff + 12: &dark_magenta f5c2e7ff + 13: &magenta f5c2e7ff + 14: &dark_cyan 94e2d5ff + 15: &cyan 94e2d5ff + 16: &light_grey bac2deff + 17: &white a6adc8ff +transparent_light_grey: &transparent_light_grey bac2deaa +transparent_black: &transparent_black 45475aaa +# .everforest: +# 0: &foreground d8caacff +# 1: &background 323d43dd +# 2: &black 4a555bff +# 3: &dark_grey 525c62ff +# 4: &dark_red e26c6eff +# 5: &red e68183ff +# 6: &dark_green 9bb86fff +# 7: &green a7c080ff +# 8: &dark_yellow d5b26bff +# 9: &yellow dbbc7fff +# 10: &dark_blue 6eb2a9ff +# 11: &blue 7fbbb3ff +# 12: &dark_magenta cf87a9ff +# 13: &magenta d699b6ff +# 14: &dark_cyan 72b783ff +# 15: &cyan 83c092ff +# 16: &light_grey d0bf9bff +# 17: &white d8caacff +# transparent_light_grey: &transparent_light_grey d0bf9baa +# transparent_black: &transparent_black 4a555baa # Fonts {{- if eq .chezmoi.hostname "helix" }} hack: &hack Hack:pixelsize=28 @@ -29,7 +50,8 @@ hack: &hack Hack:pixelsize=13 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12 {{- end }} # Labels -separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}} +separator: + &separator { string: { text: " ", font: *hack, foreground: *light_grey } } bar: {{- if eq .chezmoi.hostname "helix" }} @@ -85,32 +107,80 @@ bar: urgent: string: <<: *river_base - deco: {stack: [{background: {color: *dark_red}}, {border: {size: 6, color: *black}}]} + deco: + { + stack: + [ + { background: { color: *dark_red } }, + { border: { size: 2, color: *black } }, + ], + } foreground: *black focused: string: <<: *river_base - deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 6, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *dark_grey visible && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *transparent_light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *light_grey visible && ~occupied: string: <<: *river_base - deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *transparent_light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *light_grey ~visible && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]} + deco: + { + stack: + [ + { background: { color: *dark_grey } }, + { + underline: + { size: 1, color: *transparent_light_grey }, + }, + ], + } foreground: *light_grey ~focused && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]} + deco: + { + stack: + [ + { background: { color: *dark_grey } }, + { + underline: + { size: 1, color: *transparent_light_grey }, + }, + ], + } foreground: *light_grey id < 10 && ~visible && ~occupied: string: @@ -122,39 +192,88 @@ bar: urgent: string: <<: *river_base - deco: {stack: [{background: {color: *dark_red}}, {border: {size: 2, color: *black}}]} + deco: + { + stack: + [ + { background: { color: *dark_red } }, + { border: { size: 2, color: *black } }, + ], + } foreground: *black focused: string: <<: *river_base - deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 1, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *dark_grey visible && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *transparent_light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *light_grey visible && ~occupied: string: <<: *river_base - deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]} + deco: + { + stack: + [ + { background: { color: *transparent_light_grey } }, + { underline: { size: 1, color: *transparent_black } }, + ], + } foreground: *light_grey ~visible && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]} + deco: + { + stack: + [ + { background: { color: *dark_grey } }, + { + underline: + { size: 1, color: *transparent_light_grey }, + }, + ], + } foreground: *light_grey ~focused && occupied: string: <<: *river_base - deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]} + deco: + { + stack: + [ + { background: { color: *dark_grey } }, + { + underline: + { size: 1, color: *transparent_light_grey }, + }, + ], + } foreground: *light_grey id < 10 && ~visible && ~occupied: string: <<: *river_base - deco: {underline: {size: 1, color: *transparent_light_grey}} + deco: + { underline: { size: 1, color: *transparent_light_grey } } foreground: *light_grey - id >= 10 && ~visible && ~occupied: {empty: {}} + id >= 10 && ~visible && ~occupied: { empty: {} } {{ end }} center: - foreign-toplevel: @@ -162,8 +281,8 @@ bar: map: conditions: activated: - - string: {text: "{app-id}: {title}"} - ~activated: {empty: {}} + - string: { text: "{app-id}: {title}" } + ~activated: { empty: {} } right: - pulse: @@ -175,16 +294,25 @@ bar: wheel-down: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -5%" conditions: sink_muted: - - string: {text: , font: *awesome, foreground: *transparent_light_grey} - - string: {text: " {sink_percent}% ({sink_port})", foreground: *transparent_light_grey} + - string: + { + text: , + font: *awesome, + foreground: *transparent_light_grey, + } + - string: + { + text: " {sink_percent}% ({sink_port})", + foreground: *transparent_light_grey, + } ~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})"} + - string: { text: , font: *awesome } + - string: { text: , font: *awesome } + - string: { text: , font: *awesome } + - string: { text: " {sink_percent}% ({sink_port})" } {{- if ne .chezmoi.hostname "hydrus" }} - label: content: *separator @@ -277,7 +405,7 @@ bar: date-format: "%a %b %d" time-format: "%R" content: - - string: {text: , font: *awesome} - - string: {text: " {date} "} - - string: {text: , font: *awesome} - - string: {text: " {time} "} + - string: { text: , font: *awesome } + - string: { text: " {date} " } + - string: { text: , font: *awesome } + - string: { text: " {time} " }