From 135db95075356f7e8e421fee7a9c2d39b41a359c Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 29 Feb 2024 15:29:19 +0000
Subject: [PATCH] Re-theme back to catppuccin mocha with lavender accent

---
 flake.nix                 |  3 ++-
 home/avizo/default.nix    |  2 +-
 home/bottom/default.nix   |  2 +-
 home/emacs/default.nix    |  2 +-
 home/hyprland/default.nix | 17 +++++++++++++----
 home/rofi/default.nix     |  2 +-
 home/swaync/default.nix   |  2 +-
 system/stylix.nix         | 17 ++++++++++++-----
 8 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index eb6ca6a7..faffe95d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,8 @@
       defaultUserShell = "zsh";
       specialArgs = {
         inherit hostName user;
-        accentColour = "base0E"; # magenta
+        accentColour = "base07"; # catppuccin lavender
+        catppuccinVariant = "Mocha";
       };
     in
       nixpkgs.lib.nixosSystem {
diff --git a/home/avizo/default.nix b/home/avizo/default.nix
index 8f2f11bc..55d84238 100644
--- a/home/avizo/default.nix
+++ b/home/avizo/default.nix
@@ -1,6 +1,6 @@
 {
   config,
-  accentColour,
+  accentColour ? "base07",
   ...
 }: {
   services.avizo = {
diff --git a/home/bottom/default.nix b/home/bottom/default.nix
index 69f54bcc..7b0d8391 100644
--- a/home/bottom/default.nix
+++ b/home/bottom/default.nix
@@ -1,6 +1,6 @@
 {
   config,
-  accentColour,
+  accentColour ? "base07",
   ...
 }: {
   programs.bottom = {
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 87425d73..95d461dd 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -27,7 +27,7 @@
     extraPackages = epkgs:
       with epkgs; [
         # theme
-        modus-themes
+        catppuccin-theme
 
         # spell-checking
         flyspell-correct
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index e2746d2b..b07df858 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -2,7 +2,8 @@
   config,
   lib,
   pkgs,
-  accentColour,
+  accentColour ? "base07",
+  catppuccinVariant ? "Mocha",
   ...
 }: {
   stylix.targets.xresources.enable = true;
@@ -54,9 +55,17 @@
       package = pkgs.sweet-folders;
       name = "Sweet-Rainbow";
     };
-    theme = {
-      package = pkgs.sweet;
-      name = "Sweet-Dark";
+    theme = let
+      accent = "Lavender";
+      size = "Standard";
+    in {
+      package = with lib.strings;
+        pkgs.catppuccin-gtk.override {
+          accents = [(toLower accent)];
+          size = toLower size;
+          variant = toLower catppuccinVariant;
+        };
+      name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
     };
   };
   xdg.configFile."hypr/hyprpaper.conf".text = ''
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index 474107b1..429828fe 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -1,6 +1,6 @@
 {
   config,
-  accentColour,
+  accentColour ? "base07",
   ...
 }: {
   programs.rofi = {
diff --git a/home/swaync/default.nix b/home/swaync/default.nix
index 89074a36..9b45e3ad 100644
--- a/home/swaync/default.nix
+++ b/home/swaync/default.nix
@@ -1,7 +1,7 @@
 {
   config,
   pkgs,
-  accentColour,
+  accentColour ? "base07",
   ...
 }: {
   home.packages = [pkgs.swaynotificationcenter];
diff --git a/system/stylix.nix b/system/stylix.nix
index ed950e15..ae4acb00 100644
--- a/system/stylix.nix
+++ b/system/stylix.nix
@@ -1,6 +1,11 @@
-{pkgs, ...}: {
+{
+  lib,
+  pkgs,
+  catppuccinVariant ? "Mocha",
+  ...
+}: {
   stylix = {
-    base16Scheme = ../schemes/modus-vivendi-tinted.yaml;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${lib.strings.toLower catppuccinVariant}.yaml";
     autoEnable = false;
     targets = {
       chromium.enable = true;
@@ -14,9 +19,11 @@
       popups = 0.5;
       terminal = 0.85;
     };
-    cursor = {
-      package = pkgs.volantes-cursors;
-      name = "volantes_cursors";
+    cursor = let
+      variant = "${lib.strings.toLower catppuccinVariant}Dark";
+    in {
+      package = pkgs.catppuccin-cursors.${variant};
+      name = "Catppuccin-${catppuccinVariant}-Dark-Cursors";
     };
     fonts = rec {
       sizes = {