From 7afd75bd5a15c110dcab55be3b21d5cc489cb70c Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 11 Dec 2024 12:56:09 +0000
Subject: [PATCH] Change accent colour

---
 system/desktop.nix       | 16 +++++++++-------
 system/home/avizo.nix    | 11 ++---------
 system/home/fuzzel.nix   |  1 -
 system/home/hyprland.nix |  3 +--
 system/home/mako.nix     |  1 -
 system/home/waybar.nix   |  4 ++--
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/system/desktop.nix b/system/desktop.nix
index 56bf6c21..b43e1ffd 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -151,14 +151,14 @@
         enable = true;
         gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
         iconTheme = {
-          package = (pkgs.papirus-icon-theme.override { color = "cyan"; });
+          package = (pkgs.papirus-icon-theme.override { color = "indigo"; });
           name = if config.lib.stylix.scheme.variant == "light" then "Papirus-Light" else "Papirus-Dark";
         };
       };
-      stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; ''
-        @define-color accent_color ${base0C-hex};
-        @define-color accent_bg_color ${base0C-hex};
-      '';
+      # stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; ''
+      #   @define-color accent_color ${base0C-hex};
+      #   @define-color accent_bg_color ${base0C-hex};
+      # '';
       xdg = {
         mime.enable = true;
         mimeApps =
@@ -225,8 +225,10 @@
             };
           };
           # Autostart some programs
-          "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+          "autostart/signal-desktop.desktop".source =
+            "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
+          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source =
+            "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
         };
       };
     };
diff --git a/system/home/avizo.nix b/system/home/avizo.nix
index d5299bea..5a387f62 100644
--- a/system/home/avizo.nix
+++ b/system/home/avizo.nix
@@ -1,14 +1,7 @@
-{ config, lib, ... }:
+{ lib, ... }:
 {
   services.avizo = {
     enable = true;
-    settings.default = {
-      image-opacity = lib.mkForce "1.0";
-      border-color =
-        let
-          scheme = config.lib.stylix.scheme;
-        in
-        lib.mkForce "rgba(${scheme.base0C-rgb-r}, ${scheme.base0C-rgb-g}, ${scheme.base0C-rgb-b}, 1.0)";
-    };
+    settings.default.image-opacity = lib.mkForce "1.0";
   };
 }
diff --git a/system/home/fuzzel.nix b/system/home/fuzzel.nix
index f057a8ba..c2592105 100644
--- a/system/home/fuzzel.nix
+++ b/system/home/fuzzel.nix
@@ -19,7 +19,6 @@
         width = 1;
         radius = 5;
       };
-      colors.border = lib.mkForce "${config.lib.stylix.scheme.base0C}ff";
     };
   };
 }
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index 94aee847..c8191a36 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -61,7 +61,7 @@
       let
         font = config.stylix.fonts.sansSerif.name;
         scheme = config.lib.stylix.scheme;
-        accent = scheme.base0C;
+        accent = scheme.base0D;
       in
       {
         enable = true;
@@ -158,7 +158,6 @@
         layout = "master";
         gaps_in = 2.5;
         gaps_out = 5;
-        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.base0C})";
       };
       master = {
         allow_small_split = true;
diff --git a/system/home/mako.nix b/system/home/mako.nix
index 8c2677ff..c4930093 100644
--- a/system/home/mako.nix
+++ b/system/home/mako.nix
@@ -12,7 +12,6 @@
     iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
     borderRadius = 5;
     borderSize = 1;
-    borderColor = lib.mkForce config.lib.stylix.scheme.withHashtag.base0C;
     defaultTimeout = (builtins.mul 5 1000); # 5s timeout
   };
 }
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index 08f4275f..298050f5 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -318,7 +318,7 @@
 
         tooltip {
             background: ${scheme.base00};
-            border: 1px solid ${scheme.base0C};
+            border: 1px solid ${scheme.base0D};
             border-radius: 5px;
             box-shadow: none;
         }
@@ -366,7 +366,7 @@
             color: ${scheme.base03};
         }
         #workspaces button.active {
-            color: ${scheme.base0C};
+            color: ${scheme.base0D};
         }
         #workspaces button.urgent {
             color: ${scheme.base09};