From 021f18cd10c8884745f108db89625c0829b151bd Mon Sep 17 00:00:00 2001
From: alsaiduq-lab <riiidge.racer@gmail.com>
Date: Sun, 16 Mar 2025 15:39:43 -0600
Subject: [PATCH] update to rice

---
 modules/i3-xfce.nix          | 31 +++++++++++++++++++++---------
 pkgs/default.nix             |  9 ++++++++-
 pkgs/tokyo-night/default.nix | 37 ++++++++++++++++++++++++++++++++++++
 pkgs/vivid-icons/default.nix | 26 +++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/tokyo-night/default.nix
 create mode 100644 pkgs/vivid-icons/default.nix

diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix
index b44033c..e326991 100644
--- a/modules/i3-xfce.nix
+++ b/modules/i3-xfce.nix
@@ -1,13 +1,14 @@
 { config, pkgs, lib, ... }:
 
+let
+  customPkgs = import ../pkgs { inherit pkgs lib; };
+in
 {
   services.xserver.enable = true;
-
   services.xserver.xkb = {
     layout = "us";
     variant = "";
   };
-
   services.xserver.windowManager.i3 = {
     enable = true;
     package = pkgs.i3-gaps;
@@ -28,7 +29,6 @@
       ${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png &
     '';
   };
-
   services.xserver.desktopManager.xfce = {
     enable = true;
     noDesktop = true;
@@ -39,8 +39,8 @@
     background = "#000000";
     greeters.gtk = {
       enable = true;
-      theme.name = "Adwaita-dark";
-      iconTheme.name = "Papirus-Dark";
+      theme.name = "Tokyonight-Storm-B";
+      iconTheme.name = "Vivid-Dark-Icons";
     };
   };
   services.displayManager.defaultSession = "xfce+i3";
@@ -61,13 +61,22 @@
   };
 
   qt.enable = true;
-  qt.platformTheme = "gnome";
+  qt.platformTheme = "qt5ct";
   qt.style = "adwaita-dark";
+
   environment.etc."gtk-3.0/settings.ini".text = ''
     [Settings]
     gtk-application-prefer-dark-theme=1
-    gtk-theme-name=Adwaita-dark
-    gtk-icon-theme-name=Papirus-Dark
+    gtk-theme-name=Tokyonight-Storm-B
+    gtk-icon-theme-name=Vivid-Dark-Icons
+    gtk-font-name=Sans 10
+  '';
+
+  environment.etc."gtk-4.0/settings.ini".text = ''
+    [Settings]
+    gtk-application-prefer-dark-theme=1
+    gtk-theme-name=Tokyonight-Storm-B
+    gtk-icon-theme-name=Vivid-Dark-Icons
     gtk-font-name=Sans 10
   '';
 
@@ -76,10 +85,14 @@
     nitrogen
     xclip
     lxappearance
+    libsForQt5.qt5ct
     arc-theme
     arc-icon-theme
     papirus-icon-theme
     numix-icon-theme-circle
     candy-icons
-  ];
+  ] ++ (with customPkgs; [
+    tokyo-night-gtk
+    vivid-icons
+  ]);
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4836427..1b4997a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,5 +1,4 @@
 { pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }:
-
 let
   python-pymatting = pkgs.callPackage ./python-pymatting {
     inherit (pkgs) lib fetchPypi;
@@ -14,4 +13,12 @@ in
     python310Packages = pkgs.python310.pkgs;
     inherit python-pymatting;
   };
+
+  tokyo-night-gtk = pkgs.callPackage ./tokyo-night {
+    inherit (pkgs) lib stdenv fetchFromGitHub gtk-engine-murrine gtk_engines;
+  };
+
+  vivid-icons = pkgs.callPackage ./vivid-icons {
+    inherit (pkgs) lib stdenv fetchFromGitHub;
+  };
 }
diff --git a/pkgs/tokyo-night/default.nix b/pkgs/tokyo-night/default.nix
new file mode 100644
index 0000000..9a093cb
--- /dev/null
+++ b/pkgs/tokyo-night/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, gtk_engines }:
+
+stdenv.mkDerivation {
+  pname = "tokyo-night-gtk";
+  version = "2025-03-16";
+
+  src = fetchFromGitHub {
+    owner = "Fausto-Korpsvart";
+    repo = "Tokyo-Night-GTK-Theme";
+    rev = "cf6665a3115508a06cea28e8a23b9c90b8ef08c1";
+    sha256 = "sha256-/VhwciY8iyxWOJI3lbbNRkF86rVFrjViZ5YCxHR+mFw=";
+  };
+
+  nativeBuildInputs = [ ];
+
+  buildInputs = [
+    gtk-engine-murrine
+    gtk_engines
+  ];
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -r themes/Tokyonight-* $out/share/themes/
+  '';
+
+  meta = with lib; {
+    description = "Tokyo Night GTK Theme";
+    homepage = "https://github.com/Fausto-Korpsvart/Tokyo-Night-GTK-Theme";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/vivid-icons/default.nix b/pkgs/vivid-icons/default.nix
new file mode 100644
index 0000000..6270d9c
--- /dev/null
+++ b/pkgs/vivid-icons/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "vivid-icons";
+  version = "2025-03-16";
+
+  src = fetchFromGitHub {
+    owner = "L4ki";
+    repo = "Vivid-Plasma-Themes";
+    rev = "a7fe21fb5c51e1f66ef13c899e0e9beabd03c9f8";
+    sha256 = "sha256-UhDttFWQMkiG3Ls4UdI3jJt17PfXzfzGR4d9vS2I/1Q=";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/icons
+    cp -r "Vivid Icons Themes/"* $out/share/icons/
+  '';
+
+  meta = with lib; {
+    description = "Vivid Icons";
+    homepage = "https://github.com/L4ki/Vivid-Plasma-Themes";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [];
+  };
+}