From b7ba651a8cebb69e9edc29ddd4f7f46d2447b625 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Fri, 26 Jan 2024 23:06:43 -0700 Subject: [PATCH] update waybar config --- .../home-manager/other-files/waybar.css | 208 +++--------------- common/users/cameron/home-manager/waybar.nix | 8 +- hosts/nixos/configuration.nix | 1 + 3 files changed, 39 insertions(+), 178 deletions(-) diff --git a/common/users/cameron/home-manager/other-files/waybar.css b/common/users/cameron/home-manager/other-files/waybar.css index e6017fd..7cef3c1 100644 --- a/common/users/cameron/home-manager/other-files/waybar.css +++ b/common/users/cameron/home-manager/other-files/waybar.css @@ -5,9 +5,9 @@ } window#waybar { - background-color: rgba(43, 48, 59, 0.5); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); - color: #ffffff; + background-color: #333333; + /* border-bottom: 2px solid rgba(100, 114, 125, 0.85); */ + color: #dddddd; transition-property: background-color; transition-duration: .5s; } @@ -45,22 +45,26 @@ button { /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ button:hover { background: inherit; - box-shadow: inset 0 -3px #ffffff; + box-shadow: inset 0 -3px #cccccc; } #workspaces button { - padding: 0 5px; + padding: 0 2px; background-color: transparent; - color: #ffffff; + color: #dddddd; } #workspaces button:hover { background: rgba(0, 0, 0, 0.2); } +#workspaces button.active { + box-shadow: inset 0 -3px #ffa70a; +} + #workspaces button.focused { background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; + box-shadow: inset 0 -3px #cccccc; } #workspaces button.urgent { @@ -89,7 +93,9 @@ button:hover { #scratchpad, #mpd { padding: 0 10px; - color: #ffffff; + border-left: 2px solid #FFA70A; + background-color: #444444; + color: #dddddd; } #window, @@ -97,6 +103,22 @@ button:hover { margin: 0 4px; } +.active, +#idle_inhibitor.activated, +#battery.charging, #battery.plugged, +#tray > .needs-attention { + background-color: #5f5f5f; +} + +#network.disconnected, +#pulseaudio.muted { + background-color: #2a2a2a; +} + +#temperature.critical { + background-color: #eb4d4b; +} + /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces { margin-left: 0; @@ -107,20 +129,6 @@ button:hover { margin-right: 0; } -#clock { - background-color: #64727D; -} - -#battery { - background-color: #ffffff; - color: #000000; -} - -#battery.charging, #battery.plugged { - color: #ffffff; - background-color: #26A65B; -} - @keyframes blink { to { background-color: #ffffff; @@ -142,160 +150,10 @@ label:focus { background-color: #000000; } -#cpu { - background-color: #2ecc71; - color: #000000; -} -#memory { - background-color: #9b59b6; -} - -#disk { - background-color: #964B00; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - background-color: #2980b9; -} - -#network.disconnected { - background-color: #f53c3c; -} - -#pulseaudio { - background-color: #f1c40f; - color: #000000; -} - -#pulseaudio.muted { - background-color: #90b1b1; - color: #2a5c45; -} - -#wireplumber { - background-color: #fff0f5; - color: #000000; -} - -#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; -} - -#temperature { - background-color: #f0932b; -} - -#temperature.critical { - background-color: #eb4d4b; -} - -#tray { - background-color: #2980b9; -} - -#tray > .passive { - -gtk-icon-effect: dim; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#mpd { - background-color: #66cc99; - color: #2a5c45; -} - -#mpd.disconnected { - background-color: #f53c3c; -} - -#mpd.stopped { - background-color: #90b1b1; -} - -#mpd.paused { - background-color: #51a37a; -} - -#language { - background: #00b093; - color: #740864; - padding: 0 5px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state { - background: #97e1ad; - color: #000000; - padding: 0 0px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state > label { - padding: 0 5px; -} - -#keyboard-state > label.locked { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad.empty { +#window, +#workspaces label { + border: none; background-color: transparent; } -#privacy { - padding: 0; -} - -#privacy-item { - padding: 0 5px; - color: white; -} - -#privacy-item.screenshare { - background-color: #cf5700; -} - -#privacy-item.audio-in { - background-color: #1ca000; -} - -#privacy-item.audio-out { - background-color: #0069d4; -} diff --git a/common/users/cameron/home-manager/waybar.nix b/common/users/cameron/home-manager/waybar.nix index 47bdd6e..4a68239 100644 --- a/common/users/cameron/home-manager/waybar.nix +++ b/common/users/cameron/home-manager/waybar.nix @@ -72,15 +72,16 @@ }; temperature = { - # thermal-zone = 2; + thermal-zone = 3; # hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input"; critical-threshold = 80; # format-critical = "{temperatureC}°C {icon}"; format = "{temperatureC}°C {icon}"; - format-icons = ["" "" ""]; + format-icons = ["" "" "" "" ""]; }; backlight = { + reverse-scrolling = true; format = "{percent}% {icon}"; format-icons = ["" "" "" "" "" "" "" "" ""]; }; @@ -112,6 +113,7 @@ pulseaudio = { # scroll-step = 1; # %, can be a float + reverse-scrolling = true; format = "{volume}% {icon} {format_source}"; format-bluetooth = "{volume}% {icon} {format_source}"; format-bluetooth-muted = " {icon} {format_source}"; @@ -127,7 +129,7 @@ car = ""; default = ["" "" ""]; }; - on-click = "pavucontrol"; + on-click = "pulsemixer"; }; }; diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index d46f928..b63db35 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -100,6 +100,7 @@ lf tmux firefox + pulsemixer ]); environment.shells = with pkgs; [ bash zsh ];