From 54da358d5ed5967ecc154582ee275bf3fa488e5b Mon Sep 17 00:00:00 2001
From: "Adrian Gunnar Lauterer (aider)" <adrian@lauterer.it>
Date: Sun, 25 May 2025 21:44:46 +0200
Subject: [PATCH] fix: restore opacity contrast in waybar, correct swaylock
 colors, and fix wlogout icon styling

---
 home/gunalx/swaylock.nix | 14 +++++++-------
 home/gunalx/waybar.nix   |  6 +++---
 home/gunalx/wlogout.nix  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/home/gunalx/swaylock.nix b/home/gunalx/swaylock.nix
index dc0ed91..ba6181b 100644
--- a/home/gunalx/swaylock.nix
+++ b/home/gunalx/swaylock.nix
@@ -8,7 +8,7 @@ in
     package = pkgs.swaylock-effects;
     settings = {
       # screen & indicator
-      color                    = "#${palette.base00}";       # --color
+      color                    = "#${palette.base01}CC";       # --color
       screenshots              = true;                 # --screenshots
       fade-in                  = 0.1;                  # --fade-in
       scaling                  = "fill";               # e.g. --scaling=fill
@@ -26,12 +26,12 @@ in
       indicator-thickness      = 7;                    # --indicator-thickness
 
       # indicator colors
-      ring-color               = "#${palette.base05}";       # --ring-color
-      key-hl-color             = "#${palette.base03}";       # --key-hl-color
-      text-color               = "#${palette.base00}";       # --text-color
-      inside-color             = "#${palette.base04}";       # --inside-color
-      line-color               = "#${palette.base00}";       # --line-color
-      separator-color          = "#${palette.base00}";       # --separator-color
+      ring-color               = "#${palette.base0D}FF";       # --ring-color
+      key-hl-color             = "#${palette.base02}FF";       # --key-hl-color
+      text-color               = "#${palette.base05}FF";       # --text-color
+      inside-color             = "#${palette.base05}FF";       # --inside-color
+      line-color               = "#${palette.base01}FF";       # --line-color
+      separator-color          = "#${palette.base01}FF";       # --separator-color
 
       # effects
       effect-scale             = 0.6;                  # --effect-scale
diff --git a/home/gunalx/waybar.nix b/home/gunalx/waybar.nix
index c67f812..bfd1a44 100644
--- a/home/gunalx/waybar.nix
+++ b/home/gunalx/waybar.nix
@@ -181,7 +181,7 @@ in
 
       /* Bar container */
       window#waybar {
-        background-color: ${toRGBA palette.base01 "0.8"};
+        background-color: ${toRGBA palette.base01 "0.5"};
         border-radius: 12px;
         padding: 4px 20px;
         border: none;
@@ -194,7 +194,7 @@ in
       #idle_inhibitor,#backlight,#pulseaudio,#keyboard-state,
       #network,#cpu,#memory,#temperature,#battery,
       #power-profiles-daemon,#clock,#tray,#custom-power,#custom-launcher,#custom-overview,#niri-window {
-        background-color: ${toRGBA palette.base01 "0.6"};
+        background-color: ${toRGBA palette.base01 "0.4"};
         border-radius: 8px;
         margin: 0 6px;
         padding: 0 10px;
@@ -206,7 +206,7 @@ in
       #keyboard-state:hover,#network:hover,#cpu:hover,#memory:hover,
       #temperature:hover,#battery:hover,#power-profiles-daemon:hover,
       #clock:hover,#tray:hover,#custom-power:hover,#custom-launcher:hover,#custom-overview:hover,#niri-window:hover {
-        background-color: ${toRGBA palette.base02 "0.6"};
+        background-color: ${toRGBA palette.base02 "0.5"};
       }
 
       /* Tooltip styling */
diff --git a/home/gunalx/wlogout.nix b/home/gunalx/wlogout.nix
index e673032..ba194af 100644
--- a/home/gunalx/wlogout.nix
+++ b/home/gunalx/wlogout.nix
@@ -40,21 +40,21 @@ in
       }
 
       button {
-        color:            "#${palette.base0C}";
+        color:            #${palette.base0C};
         background-color: ${toRGBA palette.base02 "0.8"};
-        border:           2px solid "#${palette.base0C}";
+        border:           2px solid #${palette.base0C};
         border-radius:    1em;
         margin:           0.75em;
         background-repeat: no-repeat;
         background-position: center;
-        box-shadow:       0 0 4px "#${palette.base0C}";
+        box-shadow:       0 0 4px #${palette.base0C};
         padding:          0.6em 1.2em;
       }
 
       button:focus,
       button:active {
         background-color: ${toRGBA palette.base03 "0.9"};
-        box-shadow:       0 0 6px "#${palette.base0C}";
+        box-shadow:       0 0 6px #${palette.base0C};
         outline:          none;
       }