From 79b0a0d841448a1ad3b87413fe0c81bde2dab026 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 27 May 2024 21:12:23 +0100
Subject: [PATCH] Fix foot and swaync color + opacity settings

---
 programs/desktop/foot/default.nix   | 2 +-
 programs/desktop/swaync/default.nix | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/programs/desktop/foot/default.nix b/programs/desktop/foot/default.nix
index 8bf4e1d..321f258 100644
--- a/programs/desktop/foot/default.nix
+++ b/programs/desktop/foot/default.nix
@@ -21,7 +21,7 @@
       cursor = {blink = true;};
       mouse = {hide-when-typing = true;};
       colors = with config.scheme; rec {
-        opacity = 0.9;
+        alpha = 0.9;
         background = base00;
         foreground = base05;
         regular0 = base02;
diff --git a/programs/desktop/swaync/default.nix b/programs/desktop/swaync/default.nix
index 6383faa..93342f4 100644
--- a/programs/desktop/swaync/default.nix
+++ b/programs/desktop/swaync/default.nix
@@ -7,7 +7,8 @@
 }: {
   home.packages = [pkgs.swaynotificationcenter];
   xdg.configFile."swaync/style.css".text = with config.scheme.withHashtag; let
-    alpha-background = "${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.8";
+    alpha = "0.8";
+    alpha-background = "rgba(${config.scheme.base00-rgb-r}, ${config.scheme.base00-rgb-g}, ${config.scheme.base00-rgb-b}, ${alpha})";
   in ''
     * {
       all: unset;
@@ -21,7 +22,7 @@
       border-radius: 10px;
       border: 1px solid ${config.scheme.withHashtag.${accentColour}};
       margin: 18px;
-      background-color: rgba(${alpha-background});
+      background-color: ${alpha-background};
       color: ${base05};
       padding: 0;
     }
@@ -144,7 +145,7 @@
       border-radius: 10px;
       border: 1px solid ${config.scheme.withHashtag.${accentColour}};
       margin: 18px;
-      background-color: rgba(${alpha-background});
+      background-color: ${alpha-background};
       color: ${base05};
       padding: 14px;
     }