diff --git a/maskiner/legacy/configuration.nix b/maskiner/legacy/configuration.nix index da1bb90..43ae211 100644 --- a/maskiner/legacy/configuration.nix +++ b/maskiner/legacy/configuration.nix @@ -10,7 +10,7 @@ ... }: let - theme = "mocha"; + theme = "latte"; in { imports = [ @@ -67,7 +67,7 @@ in ]; waybar = { enable = true; - configPath = ./../../moduler/programs/waybar/waybar.jsonc; + configPath = ./../../moduler/programs/waybar/waybar-laptop.jsonc; stylePath = ./../../moduler/programs/waybar/waybar-${theme}.css; }; gtk = { diff --git a/moduler/programs/waybar/waybar-latte.css b/moduler/programs/waybar/waybar-latte.css index 4df0ea5..2c691a1 100644 --- a/moduler/programs/waybar/waybar-latte.css +++ b/moduler/programs/waybar/waybar-latte.css @@ -13,7 +13,6 @@ @define-color surface2 #ACB0BE; @define-color peach #FE640B; - /* -------- Base Styles -------- */ * { font-family: "FiraCode Nerd Font", "Font Awesome 7 Free"; diff --git a/moduler/programs/waybar/waybar-mocha.css b/moduler/programs/waybar/waybar-mocha.css index d511504..220f27b 100644 --- a/moduler/programs/waybar/waybar-mocha.css +++ b/moduler/programs/waybar/waybar-mocha.css @@ -32,7 +32,7 @@ window#waybar.termite { background: @base; } window#waybar.chromium { background: @base; border: none; } /* -------- Module “pill” look -------- */ -#workspaces, #clock, #mpris, #pulseaudio, #bluetooth, #upower { +#workspaces, #clock, #mpris, #pulseaudio, #bluetooth, #upower, #network { background: @base; border: none; border-radius: 5px; @@ -60,14 +60,14 @@ button { /* hover */ button:hover { background: rgba(255,255,255,0.08); - box-shadow: inset 0 -3px @peach; + box-shadow: inset 0 -3px @green; } /* active (no CSS transform in GTK; simulate press with padding + shadow) */ button:active { padding-top: 1px; /* nudge down visually */ padding-bottom: 1px; /* keep height stable */ - box-shadow: inset 0 -2px @peach; + box-shadow: inset 0 -2px @green; color: @base; } @@ -88,9 +88,9 @@ button:active { } #workspaces button.active, #workspaces button.focused { - background: @peach; + background: @green; color: @base; - box-shadow: inset 0 -3px @peach; + box-shadow: inset 0 -3px @green; } #workspaces button.urgent { @@ -101,7 +101,7 @@ button:active { /* -------- Clock -------- */ #clock { - background: @peach; + background: @green; color: @base; font-weight: 600; letter-spacing: 0.2px; @@ -109,7 +109,7 @@ button:active { /* -------- Mpris -------- */ #mpris { - background: @peach; + background: @green; color: @base; font-weight: 600; letter-spacing: 0.2px; @@ -117,7 +117,7 @@ button:active { /* -------- Pavu -------- */ #pulseaudio { - background: @peach; + background: @green; color: @base; font-weight: 600; letter-spacing: 0.2px; @@ -125,15 +125,15 @@ button:active { /* -------- Bluetooth -------- */ #bluetooth { - background: @peach; + background: @green; color: @base; font-weight: 600; letter-spacing: 0.2px; } /* -------- Upower -------- */ -#bluetooth { - background: @peach; +#upower { + background: @green; color: @base; font-weight: 600; letter-spacing: 0.2px; @@ -149,5 +149,5 @@ button:active { /* -------- Helpers -------- */ @keyframes blink { - to { background-color: @peach; color: @base; } + to { background-color: @green; color: @base; } }