From 523dd728f615a982ef7503600b8fbdaabac91992 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 2 Jun 2023 11:51:08 +0100
Subject: [PATCH] Add sweet/candy icon+folder themes, change Vanguard wallpaper

---
 home/Vanguard/xenia.nix                       |  4 +--
 home/desktop/gtk.nix                          | 18 +++++++---
 .../desktop/pkgs/candy-icon-theme/default.nix | 35 +++++++++++++++++++
 .../pkgs/sweet-folder-theme/default.nix       | 35 +++++++++++++++++++
 home/desktop/rofi.nix                         |  4 +--
 5 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 home/desktop/pkgs/candy-icon-theme/default.nix
 create mode 100644 home/desktop/pkgs/sweet-folder-theme/default.nix

diff --git a/home/Vanguard/xenia.nix b/home/Vanguard/xenia.nix
index 9db3bd8c..f57169a0 100644
--- a/home/Vanguard/xenia.nix
+++ b/home/Vanguard/xenia.nix
@@ -7,8 +7,8 @@
 
   programs.fish.shellAbbrs.hypr = "exec Hyprland";
   xdg.configFile."hypr/hyprpaper.conf".text = ''
-    preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png
-    wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png
+    preload = /mnt/secondary/syncthing/pictures/Wallpapers/Landscapes/IMG_9509.JPG
+    wallpaper = ,/mnt/secondary/syncthing/pictures/Wallpapers/Landscapes/IMG_9509.JPG
   '';
   wayland.windowManager.hyprland.extraConfig = ''
     source=./common.conf
diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index b2a75867..6b221ad5 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -3,8 +3,16 @@
   config,
   ...
 }: let
-  delta = pkgs.callPackage ./pkgs/delta-icon-theme {};
+  candy = pkgs.callPackage ./pkgs/candy-icon-theme {};
+  sweet-folder = pkgs.callPackage ./pkgs/sweet-folder-theme {};
 in {
+  home.packages = [
+    candy.candy-icon-theme
+    sweet-folder.sweet-folder-theme
+    pkgs.breeze-gtk
+    pkgs.gnome.adwaita-icon-theme
+    pkgs.hicolor-icon-theme
+  ];
   gtk = {
     enable = true;
     cursorTheme = {
@@ -12,12 +20,12 @@ in {
       name = "Catppuccin-Macchiato-Dark-Cursors";
     };
     iconTheme = {
-      package = delta.delta-icon-theme;
-      name = "Delta";
+      package = sweet-folder.sweet-folder-theme;
+      name = "Sweet-Rainbow";
     };
     theme = {
-      package = pkgs.catppuccin-gtk;
-      name = "Catppuccin-Frappe-Standard-Blue-Dark";
+      package = pkgs.sweet;
+      name = "Sweet-Dark";
     };
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
   };
diff --git a/home/desktop/pkgs/candy-icon-theme/default.nix b/home/desktop/pkgs/candy-icon-theme/default.nix
new file mode 100644
index 00000000..0432b4ea
--- /dev/null
+++ b/home/desktop/pkgs/candy-icon-theme/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+}: {
+  candy-icon-theme = stdenvNoCC.mkDerivation rec {
+    pname = "candy-icon-theme";
+    version = "6a35be5cb133c6be8314807f55da3d795e24fb86";
+    dontBuild = true;
+
+    src = fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "candy-icons";
+      rev = version;
+      sha256 = "sha256-M58ts/xyVf+ZDidd4MEp/LlU3vk2imEwOnb0/sVJUYo=";
+    };
+
+    nativeBuildInputs = [gtk3];
+
+    dontDropIconThemeCache = true;
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share/icons/Sweet-folders
+      mv * $out/share/icons/Sweet-folders
+
+      for theme in $out/share/icons/*; do
+        gtk-update-icon-cache --force $theme
+      done
+
+      runHook postInstall
+    '';
+  };
+}
diff --git a/home/desktop/pkgs/sweet-folder-theme/default.nix b/home/desktop/pkgs/sweet-folder-theme/default.nix
new file mode 100644
index 00000000..6c3920de
--- /dev/null
+++ b/home/desktop/pkgs/sweet-folder-theme/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+}: {
+  sweet-folder-theme = stdenvNoCC.mkDerivation rec {
+    pname = "sweet-folder-theme";
+    version = "b2192ff1412472f036fdf9778c6b9dbcb6c044ec";
+    dontBuild = true;
+
+    src = fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "Sweet-folders";
+      rev = version;
+      sha256 = "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE=";
+    };
+
+    nativeBuildInputs = [gtk3];
+
+    dontDropIconThemeCache = true;
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share/icons
+      mv Sweet-Rainbow $out/share/icons
+
+      for theme in $out/share/icons/*; do
+        gtk-update-icon-cache --force $theme
+      done
+
+      runHook postInstall
+    '';
+  };
+}
diff --git a/home/desktop/rofi.nix b/home/desktop/rofi.nix
index 05fad0b4..42d789de 100644
--- a/home/desktop/rofi.nix
+++ b/home/desktop/rofi.nix
@@ -8,13 +8,13 @@ in {
     enable = true;
     location = "center";
     pass.enable = true;
-    terminal = "\${pkgs.foot}/bin/foot";
+    terminal = "wezterm";
     plugins = with pkgs; [
       rofi-calc
     ];
     extraConfig = {
       modi = "run,drun,calc";
-      icon-theme = "Delta";
+      icon-theme = "Sweet-Rainbow";
       show-icons = true;
       drun-display-format = "{icon} {name}";
       disable-history = false;