mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-09-19 11:28:07 -04:00
Updated waybar style and for second output
This commit is contained in:
parent
b3da97bc30
commit
d4949b784e
GPG key ID:
7CD5A5977E4931C1
2 changed files with 266 additions and 71 deletions
|
|
@ -1,14 +1,18 @@
|
|||
{
|
||||
[{
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
"output": "DP-1",
|
||||
"position": "bottom",
|
||||
"width": 1920,
|
||||
{{- else if eq .chezmoi.hostname "helix" }}
|
||||
"output": "eDP-1",
|
||||
"position": "top",
|
||||
"width": 3840,
|
||||
{{- else }}
|
||||
"output": "eDP-1",
|
||||
"position": "top",
|
||||
{{- end }}
|
||||
"layer": "top",
|
||||
"height": 24,
|
||||
// "width": 1280,
|
||||
"height": 32,
|
||||
"spacing": 4,
|
||||
|
||||
"modules-left": [
|
||||
|
|
@ -24,10 +28,6 @@
|
|||
"modules-right": [
|
||||
"idle_inhibitor",
|
||||
"pulseaudio",
|
||||
"network",
|
||||
"cpu",
|
||||
"memory",
|
||||
"temperature",
|
||||
"keyboard-state",
|
||||
"clock",
|
||||
"tray"
|
||||
|
|
@ -59,7 +59,6 @@
|
|||
},
|
||||
|
||||
"river/tags": {
|
||||
//"tag-labels": ["1", "2", "3", "4", "5"],
|
||||
//"num-tags": 5
|
||||
},
|
||||
|
||||
|
|
@ -167,5 +166,124 @@
|
|||
},
|
||||
"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle"
|
||||
},
|
||||
}
|
||||
},
|
||||
{
|
||||
{{- if eq .chezmoi.hostname "hydrus" }}
|
||||
"output": "DP-2",
|
||||
"position": "bottom",
|
||||
"width": 1920,
|
||||
"layer": "top",
|
||||
"height": 32,
|
||||
"spacing": 4,
|
||||
|
||||
"modules-left": [
|
||||
"river/tags"
|
||||
],
|
||||
|
||||
"modules-center": [
|
||||
"river/window",
|
||||
],
|
||||
|
||||
"modules-right": [
|
||||
"backlight",
|
||||
"network",
|
||||
"cpu",
|
||||
"memory",
|
||||
"temperature",
|
||||
"clock",
|
||||
],
|
||||
|
||||
"keyboard-state": {
|
||||
"numlock": false,
|
||||
"capslock": true,
|
||||
"format": "{name} {icon}",
|
||||
"format-icons": {
|
||||
"locked": "",
|
||||
"unlocked": ""
|
||||
}
|
||||
},
|
||||
|
||||
"river/mode": {
|
||||
"format": "mode: {}"
|
||||
},
|
||||
|
||||
"river/tags": {
|
||||
//"num-tags": 5
|
||||
},
|
||||
|
||||
"idle_inhibitor": {
|
||||
"format": "{icon}",
|
||||
"format-icons": {
|
||||
"activated": "",
|
||||
"deactivated": ""
|
||||
}
|
||||
},
|
||||
|
||||
"tray": {
|
||||
"icon-size": 18,
|
||||
"spacing": 10
|
||||
},
|
||||
|
||||
"clock": {
|
||||
"format": "{:%H:%M}",
|
||||
// "timezone": "America/New_York",
|
||||
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
||||
"format-alt": "{:%Y-%m-%d}"
|
||||
},
|
||||
|
||||
"cpu": {
|
||||
"format": "{usage}% ",
|
||||
"tooltip": true
|
||||
},
|
||||
|
||||
"memory": {
|
||||
"format": "{}% "
|
||||
},
|
||||
|
||||
"temperature": {
|
||||
// "thermal-zone": 2,
|
||||
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
||||
// "critical-threshold": 80,
|
||||
// "format-critical": "{temperatureC}°C {icon}",
|
||||
"format": "{temperatureC}°C {icon}",
|
||||
"format-icons": ["", "", ""]
|
||||
},
|
||||
|
||||
"backlight": {
|
||||
// "device": "acpi_video1",
|
||||
"format": "{percent}% {icon}",
|
||||
"format-icons": ["", "", "", "", "", "", "", "", ""]
|
||||
},
|
||||
|
||||
"network": {
|
||||
// "interface": "wlan0",
|
||||
"format-wifi": "{essid} ({signalStrength}%) ",
|
||||
"format-ethernet": "{ipaddr}/{cidr} ",
|
||||
"tooltip-format": "{ifname} via {gwaddr} ",
|
||||
"format-linked": "{ifname} (No IP) ",
|
||||
"format-disconnected": "Disconnected ⚠",
|
||||
"format-alt": "{ifname}: {ipaddr}/{cidr}"
|
||||
},
|
||||
|
||||
"pulseaudio": {
|
||||
"scroll-step": 1,
|
||||
"format": "{volume}% {icon} {format_source}",
|
||||
"format-bluetooth": "{volume}% {icon} {format_source}",
|
||||
"format-bluetooth-muted": " {icon} {format_source}",
|
||||
"format-muted": " {format_source}",
|
||||
"format-source": "{volume}% ",
|
||||
"format-source-muted": "",
|
||||
"format-icons": {
|
||||
"headphone": "",
|
||||
"hands-free": "",
|
||||
"headset": "",
|
||||
"phone": "",
|
||||
"portable": "",
|
||||
"car": "",
|
||||
"default": ["", "", ""]
|
||||
},
|
||||
"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle"
|
||||
},
|
||||
{{- end }}
|
||||
}]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
* {
|
||||
/* `otf-font-awesome` is required to be installed for icons */
|
||||
font-family: FontAwesome, Hack, monospace;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
|
@ -68,12 +67,17 @@ button:hover {
|
|||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: #eb4d4b;
|
||||
background-color: #e26c6e;
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: #64727d;
|
||||
border-bottom: 3px solid #4a555b;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#clock,
|
||||
|
|
@ -112,19 +116,34 @@ button:hover {
|
|||
}
|
||||
|
||||
#clock {
|
||||
background-color: #6eb2a9;
|
||||
color: #4a555b;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#battery {
|
||||
background-color: #4a555b;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#battery.charging,
|
||||
#battery.plugged {
|
||||
color: #4a555b;
|
||||
background-color: #26a65b;
|
||||
background-color: #9bb86f;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
|
|
@ -135,13 +154,19 @@ button:hover {
|
|||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
background-color: #f53c3c;
|
||||
background-color: #e26c6e;
|
||||
color: #4a555b;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: linear;
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
|
||||
}
|
||||
|
||||
label:focus {
|
||||
|
|
@ -149,73 +174,116 @@ label:focus {
|
|||
}
|
||||
|
||||
#cpu {
|
||||
background-color: #9bb86f;
|
||||
color: #4a555b;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#memory {
|
||||
background-color: #cf87a9;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#disk {
|
||||
background-color: #964b00;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#backlight {
|
||||
background-color: #90b1b1;
|
||||
background-color: #d0bf9b;
|
||||
}
|
||||
|
||||
#network {
|
||||
background-color: #83c092;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
background-color: #e68183;
|
||||
background-color: #e26c6e;
|
||||
color: #4a555b;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
background-color: #d5b26b;
|
||||
color: #4a555b;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
background-color: #dbbc7f;
|
||||
color: #4a555b;
|
||||
background-color: #525c62;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#wireplumber {
|
||||
background-color: #fff0f5;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#wireplumber.muted {
|
||||
background-color: #f53c3c;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
background-color: #66cc99;
|
||||
color: #2a5c45;
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
#custom-media.custom-spotify {
|
||||
background-color: #66cc99;
|
||||
}
|
||||
|
||||
#custom-media.custom-vlc {
|
||||
background-color: #ffa000;
|
||||
background-color: #525c62;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#temperature {
|
||||
background-color: #e2966c;
|
||||
background-color: #323d43;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#temperature.critical {
|
||||
background-color: #eb4d4b;
|
||||
background-color: #e26c6e;
|
||||
color: #4a555b;
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: #323d43;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#tray > .passive {
|
||||
|
|
@ -229,29 +297,22 @@ label:focus {
|
|||
|
||||
#idle_inhibitor {
|
||||
background-color: #525c62;
|
||||
color: #d0bf9b;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
background-color: #d0bf9b;
|
||||
color: #525c62;
|
||||
}
|
||||
|
||||
#mpd {
|
||||
background-color: #66cc99;
|
||||
color: #2a5c45;
|
||||
}
|
||||
|
||||
#mpd.disconnected {
|
||||
background-color: #f53c3c;
|
||||
}
|
||||
|
||||
#mpd.stopped {
|
||||
background-color: #90b1b1;
|
||||
}
|
||||
|
||||
#mpd.paused {
|
||||
background-color: #51a37a;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(50, 61, 67, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(50, 61, 67, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#language {
|
||||
|
|
@ -263,11 +324,16 @@ label:focus {
|
|||
}
|
||||
|
||||
#keyboard-state {
|
||||
background: #72b783;
|
||||
color: #4a555b;
|
||||
background: #323d43;
|
||||
color: #d8caac;
|
||||
padding: 0 0px;
|
||||
margin: 0 0px;
|
||||
min-width: 16px;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#keyboard-state > label {
|
||||
|
|
@ -275,7 +341,7 @@ label:focus {
|
|||
}
|
||||
|
||||
#keyboard-state > label.locked {
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
background: rgba(0, 0, 0, .2);
|
||||
}
|
||||
|
||||
#scratchpad {
|
||||
|
|
@ -289,8 +355,8 @@ label:focus {
|
|||
/* River */
|
||||
|
||||
#mode.normal {
|
||||
background-color: #323d43;
|
||||
color: #d0bf9b;
|
||||
color: #d8caac;
|
||||
background-color: #4a555b;
|
||||
}
|
||||
|
||||
#mode.passthrough {
|
||||
|
|
@ -303,15 +369,26 @@ label:focus {
|
|||
#tags button.occupied {
|
||||
background-color: #525c62;
|
||||
color: #d8caac;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(208, 191, 155, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#tags button.focused {
|
||||
background-color: #d0bf9b;
|
||||
color: #4a555b;
|
||||
{{- if eq .chezmoi.hostname "hydrus"}}
|
||||
border-bottom: 3px solid rgba(50, 61, 67, 0.7);
|
||||
{{- else }}
|
||||
border-top: 3px solid rgba(50, 61, 67, 0.7);
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
#tags button.urgent {
|
||||
background-color: #e26c6e;
|
||||
color: #4a555b;
|
||||
}
|
||||
|
||||
#window {
|
||||
|
|
|
|||
Loading…
Reference in a new issue