a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-09-19 11:28:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

yambar: switch colors to catppuccin mocha, various deco updates

Browse source
This commit is contained in:
Andrew Scott 2024-09-14 10:48:29 -04:00
parent 9dee244501
commit 09617e0d62
Signed by: a
GPG key ID: 7CD5A5977E4931C1
2 changed files with 310 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

186
dot_config/yambar/bar2.yml.tmpl
View file

@ -1,25 +1,46 @@
# Colors # Colors
.everforest: .catppuccin_mocha:
0: &foreground d8caacff 0: &foreground cdd6f4ff
1: &background 323d43dd 1: &background 1e1e2edd
2: &black 4a555bff 2: &black 45475aff
3: &dark_grey 525c62ff 3: &dark_grey 45475aff
4: &dark_red e26c6eff 4: &dark_red f38ba8ff
5: &red e68183ff 5: &red f38ba8ff
6: &dark_green 9bb86fff 6: &dark_green a6e3a1ff
7: &green a7c080ff 7: &green a6e3a1ff
8: &dark_yellow d5b26bff 8: &dark_yellow f9e2afff
9: &yellow dbbc7fff 9: &yellow f9e2afff
10: &dark_blue 6eb2a9ff 10: &dark_blue 89b4faff
11: &blue 7fbbb3ff 11: &blue 89b4faff
12: &dark_magenta cf87a9ff 12: &dark_magenta f5c2e7ff
13: &magenta d699b6ff 13: &magenta f5c2e7ff
14: &dark_cyan 72b783ff 14: &dark_cyan 94e2d5ff
15: &cyan 83c092ff 15: &cyan 94e2d5ff
16: &light_grey d0bf9bff 16: &light_grey bac2deff
17: &white d8caacff 17: &white a6adc8ff
transparent_light_grey: &transparent_light_grey d0bf9b99 transparent_light_grey: &transparent_light_grey bac2deaa
transparent_black: &transparent_black 4a555b99 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 # Fonts
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
hack: &hack Hack:pixelsize=28 hack: &hack Hack:pixelsize=28
@ -29,7 +50,8 @@ hack: &hack Hack:pixelsize=13
awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
{{- end }} {{- end }}
# Labels # Labels
separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}} separator:
&separator { string: { text: " ", font: *hack, foreground: *light_grey } }
bar: bar:
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
@ -122,39 +144,88 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *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 foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *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 foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
~visible && occupied: ~visible && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
~focused && occupied: ~focused && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: {underline: {size: 1, color: *transparent_light_grey}} deco:
{ underline: { size: 1, color: *transparent_light_grey } }
foreground: *light_grey foreground: *light_grey
id >= 10 && ~visible && ~occupied: {empty: {}} id >= 10 && ~visible && ~occupied: { empty: {} }
{{ end }} {{ end }}
center: center:
- foreign-toplevel: - foreign-toplevel:
@ -162,8 +233,8 @@ bar:
map: map:
conditions: conditions:
activated: activated:
- string: {text: "{app-id}: {title}"} - string: { text: "{app-id}: {title}" }
~activated: {empty: {}} ~activated: { empty: {} }
right: right:
{{- if eq .chezmoi.hostname "hydrus" }} {{- if eq .chezmoi.hostname "hydrus" }}
@ -172,42 +243,54 @@ bar:
- network: - network:
content: content:
map: map:
default: {empty: {}} default: { empty: {} }
conditions: conditions:
name >= wlan0 && name <= wlan9: name >= wlan0 && name <= wlan9:
map: map:
conditions: conditions:
~carrier: {empty: {}} ~carrier: { empty: {} }
carrier: carrier:
map: map:
default: default:
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up"} - string:
{
text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up",
}
conditions: conditions:
ipv4 == "": ipv4 == "":
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"} - string:
{
text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
}
- network: - network:
content: content:
map: map:
default: {empty: {}} default: { empty: {} }
conditions: conditions:
name >= eth0 && name <= eth9: name >= eth0 && name <= eth9:
map: map:
conditions: conditions:
~carrier: {empty: {}} ~carrier: { empty: {} }
carrier: carrier:
map: map:
default: default:
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"} - string:
{
text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
}
conditions: conditions:
state == down: {string: {text: , font: *awesome}} state == down: { string: { text: , font: *awesome } }
ipv4 == "": ipv4 == "":
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"} - string:
{
text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
}
- label: - label:
content: *separator content: *separator
{{- end }} {{- end }}
- cpu: - cpu:
poll-interval: 2000 poll-interval: 2000
@ -215,13 +298,12 @@ bar:
map: map:
conditions: conditions:
id == -1: id == -1:
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {cpu}%"} - string: { text: " {cpu}%" }
- label: - label:
content: *separator content: *separator
- mem: - mem:
poll-interval: 5000 poll-interval: 5000
content: content:
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {used:mb} MiB ({percent_used}% Used)"} - string: { text: " {used:mb} MiB ({percent_used}% Used)" }

224
dot_config/yambar/config.yml.tmpl
View file

@ -1,25 +1,46 @@
# Colors # Colors
.everforest: .catppuccin_mocha:
0: &foreground d3c6aaff 0: &foreground cdd6f4ff
1: &background 272e33dd 1: &background 1e1e2edd
2: &black 4a555bff 2: &black 45475aff
3: &dark_grey 525c62ff 3: &dark_grey 45475aff
4: &dark_red e26c6eff 4: &dark_red f38ba8ff
5: &red e68183ff 5: &red f38ba8ff
6: &dark_green 9bb86fff 6: &dark_green a6e3a1ff
7: &green a7c080ff 7: &green a6e3a1ff
8: &dark_yellow d5b26bff 8: &dark_yellow f9e2afff
9: &yellow dbbc7fff 9: &yellow f9e2afff
10: &dark_blue 6eb2a9ff 10: &dark_blue 89b4faff
11: &blue 7fbbb3ff 11: &blue 89b4faff
12: &dark_magenta cf87a9ff 12: &dark_magenta f5c2e7ff
13: &magenta d699b6ff 13: &magenta f5c2e7ff
14: &dark_cyan 72b783ff 14: &dark_cyan 94e2d5ff
15: &cyan 83c092ff 15: &cyan 94e2d5ff
16: &light_grey d0bf9bff 16: &light_grey bac2deff
17: &white d8caacff 17: &white a6adc8ff
transparent_light_grey: &transparent_light_grey d0bf9baa transparent_light_grey: &transparent_light_grey bac2deaa
transparent_black: &transparent_black 4a555baa 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 # Fonts
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
hack: &hack Hack:pixelsize=28 hack: &hack Hack:pixelsize=28
@ -29,7 +50,8 @@ hack: &hack Hack:pixelsize=13
awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
{{- end }} {{- end }}
# Labels # Labels
separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}} separator:
&separator { string: { text: " ", font: *hack, foreground: *light_grey } }
bar: bar:
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
@ -85,32 +107,80 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *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 foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *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 foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
~visible && occupied: ~visible && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
~focused && occupied: ~focused && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
@ -122,39 +192,88 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *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 foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *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 foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
~visible && occupied: ~visible && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
~focused && occupied: ~focused && occupied:
string: string:
<<: *river_base <<: *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 foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: {underline: {size: 1, color: *transparent_light_grey}} deco:
{ underline: { size: 1, color: *transparent_light_grey } }
foreground: *light_grey foreground: *light_grey
id >= 10 && ~visible && ~occupied: {empty: {}} id >= 10 && ~visible && ~occupied: { empty: {} }
{{ end }} {{ end }}
center: center:
- foreign-toplevel: - foreign-toplevel:
@ -162,8 +281,8 @@ bar:
map: map:
conditions: conditions:
activated: activated:
- string: {text: "{app-id}: {title}"} - string: { text: "{app-id}: {title}" }
~activated: {empty: {}} ~activated: { empty: {} }
right: right:
- pulse: - pulse:
@ -175,16 +294,25 @@ bar:
wheel-down: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -5%" wheel-down: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -5%"
conditions: conditions:
sink_muted: sink_muted:
- string: {text: , font: *awesome, foreground: *transparent_light_grey} - string:
- string: {text: " {sink_percent}% ({sink_port})", foreground: *transparent_light_grey} {
text: ,
font: *awesome,
foreground: *transparent_light_grey,
}
- string:
{
text: " {sink_percent}% ({sink_port})",
foreground: *transparent_light_grey,
}
~sink_muted: ~sink_muted:
- ramp: - ramp:
tag: sink_percent tag: sink_percent
items: items:
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {sink_percent}% ({sink_port})"} - string: { text: " {sink_percent}% ({sink_port})" }
{{- if ne .chezmoi.hostname "hydrus" }} {{- if ne .chezmoi.hostname "hydrus" }}
- label: - label:
content: *separator content: *separator
@ -277,7 +405,7 @@ bar:
date-format: "%a %b %d" date-format: "%a %b %d"
time-format: "%R" time-format: "%R"
content: content:
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {date} "} - string: { text: " {date} " }
- string: {text: , font: *awesome} - string: { text: , font: *awesome }
- string: {text: " {time} "} - string: { text: " {time} " }