From 390883b318b48aa1685bebaa149912bee8ea70b4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 15 Apr 2024 10:40:04 +0100
Subject: [PATCH] Sway: add urgent theme, add blur to swaync notifications

Add catppuccin theme to Xresources and set HiDPI for Scorch (for
Xwayland applications)
---
 home/desktop.nix      | 21 +++++++++++++++++++++
 home/sway/default.nix | 13 +++++++++----
 hosts/Scorch/home.nix |  1 +
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/home/desktop.nix b/home/desktop.nix
index 9ed056bb..ebff369d 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -2,6 +2,7 @@
   lib,
   config,
   pkgs,
+  scheme,
   catppuccinVariant ? "Mocha",
   ...
 }: {
@@ -60,4 +61,24 @@
       name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
     };
   };
+  xresources.properties = with scheme.withHashtag; {
+    "*background" = base00;
+    "*foreground" = base05;
+    "*color0" = base00;
+    "*color1" = red;
+    "*color2" = green;
+    "*color3" = yellow;
+    "*color4" = blue;
+    "*color5" = magenta;
+    "*color6" = cyan;
+    "*color7" = base04;
+    "*color8" = base01;
+    "*color9" = red;
+    "*color10" = green;
+    "*color11" = yellow;
+    "*color12" = blue;
+    "*color13" = magenta;
+    "*color14" = cyan;
+    "*color15" = base05;
+  };
 }
diff --git a/home/sway/default.nix b/home/sway/default.nix
index e4442e73..82bfd940 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -35,7 +35,10 @@
       menu = "${config.programs.rofi.finalPackage}/bin/rofi -show drun";
       workspaceAutoBackAndForth = true;
       bars = [];
-      gaps = {inner = 10;};
+      gaps = {
+        inner = 5;
+        outer = 5;
+      };
       fonts = {
         names = [fonts.monospace.name];
         style = "regular";
@@ -51,14 +54,15 @@
           border = toString scheme.withHashtag.${accentColour};
           childBorder = border;
         };
-        unfocused = rec {
+        focusedInactive = rec {
           inherit background text indicator;
           border = toString base03;
           childBorder = border;
         };
-        focusedInactive = rec {
+        unfocused = focusedInactive;
+        urgent = rec {
           inherit background text indicator;
-          border = toString base03;
+          border = toString red;
           childBorder = border;
         };
       };
@@ -162,6 +166,7 @@
       shadows enable
       shadow_blur_radius 4
       layer_effects "waybar" blur enable; blur_ignore_transparent enable
+      layer_effects "swaync-notification-window" blur enable; blur_ignore_transparent enable
       layer_effects "swaync-control-center" blur enable; blur_ignore_transparent enable
       layer_effects "rofi" blur enable; blur_ignore_transparent enable
       titlebar_separator enable
diff --git a/hosts/Scorch/home.nix b/hosts/Scorch/home.nix
index 6537b7a6..137a17a6 100644
--- a/hosts/Scorch/home.nix
+++ b/hosts/Scorch/home.nix
@@ -14,4 +14,5 @@
       scale = "1.5";
     };
   };
+  xresources.properties."Xft.dpi" = toString (builtins.mul 96 1.5);
 }