From 5556b760e96ef9fe02d9364f94426e74586c2c47 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sat, 17 Jun 2023 01:32:09 -0400 Subject: [PATCH] Additional configuration for river tags --- dot_config/river/executable_init.tmpl | 1 + dot_config/waybar/config.tmpl | 30 ++++++++++++++++++++++--- dot_config/waybar/style.css.tmpl | 32 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dot_config/river/executable_init.tmpl b/dot_config/river/executable_init.tmpl index 5eb5118..c2a5d67 100644 --- a/dot_config/river/executable_init.tmpl +++ b/dot_config/river/executable_init.tmpl @@ -213,6 +213,7 @@ swayidle -w timeout 600 "waylock -fork-on-lock -init-color 0x000000" & {{- end }} gammastep -r & waybar-launcher & +river-tag-overlay & blueman-applet & evolution & mattermost-desktop & diff --git a/dot_config/waybar/config.tmpl b/dot_config/waybar/config.tmpl index 57186fd..98d5c78 100644 --- a/dot_config/waybar/config.tmpl +++ b/dot_config/waybar/config.tmpl @@ -20,6 +20,7 @@ "river/window" ], +{{- if eq .chezmoi.hostname "hydrus"}} "modules-right": [ "idle_inhibitor", "pulseaudio", @@ -31,6 +32,17 @@ "clock", "tray" ], +{{- else }} + "modules-right": [ + "idle_inhibitor", + "backlight", + "pulseaudio", + "network", + "battery", + "clock", + "tray" + ], +{{- end }} "keyboard-state": { "numlock": false, @@ -66,7 +78,7 @@ "clock": { "format": "{:%H:%M}", - "timezone": "America/New_York", + // "timezone": "America/New_York", "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d}" }, @@ -81,9 +93,15 @@ }, "temperature": { +{{- if eq .chezmoi.hostname "helix" }} + "thermal-zone": 0, + "hwmon-path": "/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon4/temp1_input", + "critical-threshold": 90, +{{- else }} // "thermal-zone": 2, // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, + // "critical-threshold": 80, +{{- end }} // "format-critical": "{temperatureC}°C {icon}", "format": "{temperatureC}°C {icon}", "format-icons": ["", "", ""] @@ -97,7 +115,9 @@ "battery": { "states": { - // "good": 95, +{{- if eq .chezmoi.hostname "helix"}} + "good": 59, +{{- end }} "warning": 30, "critical": 15 }, @@ -116,7 +136,11 @@ "network": { // "interface": "wlan0", +{{- if eq .chezmoi.hostname "hydrus" }} "format-wifi": "{essid} ({signalStrength}%) ", +{{- else }} + "format-wifi": "{signalStrength}% ", +{{- end }} "format-ethernet": "{ipaddr}/{cidr} ", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", diff --git a/dot_config/waybar/style.css.tmpl b/dot_config/waybar/style.css.tmpl index d656e3b..a83e2db 100644 --- a/dot_config/waybar/style.css.tmpl +++ b/dot_config/waybar/style.css.tmpl @@ -285,3 +285,35 @@ label:focus { #scratchpad.empty { background-color: transparent; } + +/* River */ + +#mode.normal { + background-color: #323d43; + color: #d0bf9b; +} + +#mode.passthrough { + background-color: #d0bf9b; + color: #4a555b; +} + +#tags button {} + +#tags button.occupied { + background-color: #525c62; + color: #d8caac; +} + +#tags button.focused { + background-color: #d0bf9b; + color: #4a555b; +} + +#tags button.urgent { + background-color: #e26c6e; +} + +#window { + font-size: 10px; +}