Update border/underlines/margins, add ethernet module

This commit is contained in:
Andrew Scott 2023-07-14 19:05:23 -04:00
parent 2d839270ab
commit f6e086982d
Signed by: a
GPG key ID: 7CD5A5977E4931C1

View file

@ -1,6 +1,7 @@
# Colors
.everforest: .everforest:
0: &foreground d8caacff 0: &foreground d8caacff
1: &background 323d43cc 1: &background 323d43dd
2: &black 4a555bff 2: &black 4a555bff
3: &dark_grey 525c62ff 3: &dark_grey 525c62ff
4: &dark_red e26c6eff 4: &dark_red e26c6eff
@ -17,20 +18,22 @@
15: &cyan 83c092ff 15: &cyan 83c092ff
16: &light_grey d0bf9bff 16: &light_grey d0bf9bff
17: &white d8caacff 17: &white d8caacff
transparent_light_grey: &transparent_light_grey d0bf9b99
transparent_black: &transparent_black 4a555b99
# Fonts
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
hack: &hack Hack:pixelsize=28 hack: &hack Hack:pixelsize=24
awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=26 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=24
{{- else}} {{- else}}
hack: &hack Hack:pixelsize=13 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 }}
separator: &separator {string: {text: " | ", font: *hack, foreground: *light_grey}} # Labels
light_underline: &light_underline d0bf9b99 separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}}
dark_underline: &dark_underline 4a555b99
bar: bar:
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
height: 72 height: 64
location: top location: top
{{- else if eq .chezmoi.hostname "hydrus" }} {{- else if eq .chezmoi.hostname "hydrus" }}
monitor: DP-1 monitor: DP-1
@ -48,16 +51,16 @@ bar:
background: *background background: *background
border: border:
{{- if eq .chezmoi.hostname "hydrus" }} {{- if eq .chezmoi.hostname "hydrus" }}
top-width: 0 bottom-margin: 4
bottom-width: 2 left-margin: 8
right-margin: 8
{{- else }} {{- else }}
top-width: 4 top-margin: 8
bottom-width: 0 left-margin: 16
right-margin: 16
{{- end }} {{- end }}
left-width: 0 width: 0
right-width: 0 color: *transparent_light_grey
color: *light_underline
margin: 0
left: left:
- river: - river:
@ -81,32 +84,32 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *river_base
deco: {stack: [{background: {color: *dark_red}}, {underline: {size: 4, color: *black}}]} deco: {stack: [{background: {color: *dark_red}}, {border: {size: 6, color: *black}}]}
foreground: *black foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *river_base
deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 4, color: *dark_underline}}]} deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
foreground: *dark_grey foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: {stack: [{background: {color: *light_underline}}, {underline: {size: 4, color: *dark_underline}}]} deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
foreground: *light_grey foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: {stack: [{background: {color: *light_underline}}, {underline: {size: 4, color: *dark_underline}}]} deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, 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: 4, color: *light_underline}}]} deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, 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: 4, color: *light_underline}}]} deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]}
foreground: *light_grey foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
@ -133,8 +136,8 @@ 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: *light_underline} - string: {text: , font: *awesome, foreground: *transparent_light_grey}
- string: {text: " {sink_percent}% ({sink_port})", foreground: *light_underline} - string: {text: " {sink_percent}% ({sink_port})", foreground: *transparent_light_grey}
~sink_muted: ~sink_muted:
- ramp: - ramp:
tag: sink_percent tag: sink_percent
@ -159,23 +162,38 @@ bar:
content: *separator content: *separator
- network: - network:
name: wlan0 name: wlan0
poll-interval: 1000 poll-interval: 60
content: content:
map: map:
default: {string: {text: , font: *awesome}} default: {string: {text: , font: *awesome}}
conditions: conditions:
state == down: {string: {text: , font: *awesome, foreground: *dark_grey}} state == down: {string: {text: , font: *awesome, foreground: *dark_grey}}
state == up: state == up:
map: map:
default: default:
- string: {text: , font: *awesome} - string: {text: , font: *awesome}
- string: {text: " {name}: {state}"} - string: {text: " {name}: {state}"}
#- string: {text: " {ssid} {dl-speed:mb}/{ul-speed:mb} Mb/s", foreground: *light_grey}
conditions: conditions:
ipv4 == "": ipv4 == "":
- string: {text: , font: *awesome} - string: {text: , font: *awesome}
- string: {text: " {name}: {state}"} - string: {text: " {name}: {state}"}
#- string: {text: " {ssid} {dl-speed:mb}/{ul-speed:mb} Mb/s", foreground: *light_grey} - network:
name: eth0
poll-interval: 60
content:
map:
conditions:
~carrier: {empty: {}}
carrier:
map:
default:
- string: {text: , font: *awesome}
- string: {text: " {name}: {state}"}
conditions:
state == down: {string: {text: , font: *awesome}}
ipv4 == "":
- string: {text: , font: *awesome}
- string: {text: " {name}: {state}"}
- label: - label:
content: *separator content: *separator
- battery: - battery:
@ -218,6 +236,6 @@ bar:
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} "}