From 080110e84574d05572e0b734bd5e81ffeebe9177 Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Thu, 21 Mar 2024 10:59:16 -0400
Subject: [PATCH] Replace Qogir theme with Papirus

---
 modules/ui/flatpak.nix         |  1 +
 modules/ui/gnome.nix           | 12 +-----------
 modules/users/common/gnome.nix |  6 ++++++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/ui/flatpak.nix b/modules/ui/flatpak.nix
index 3f01eb7..f0fde02 100644
--- a/modules/ui/flatpak.nix
+++ b/modules/ui/flatpak.nix
@@ -52,6 +52,7 @@ with lib;
 				paths = with pkgs; [
 					#libsForQt5.breeze-qt5	# for plasma
 					gnome.gnome-themes-extra
+					papirus-icon-theme
 				];
 				pathsToLink = [ "/share/icons" ];
 			};
diff --git a/modules/ui/gnome.nix b/modules/ui/gnome.nix
index f2a78e8..eef3f55 100644
--- a/modules/ui/gnome.nix
+++ b/modules/ui/gnome.nix
@@ -3,16 +3,6 @@
 # UI and desktop-related options
 let
 	cfg = config.host.ui.gnome;
-
-	# Override Qogir icon theme to keep it more up-to-date
-	qogir-icon-theme_new = pkgs.qogir-icon-theme.overrideAttrs (old: {
-		version = "git";
-		src = builtins.fetchGit {
-			url = "https://github.com/vinceliuice/Qogir-icon-theme.git";
-			ref = "master";
-			rev = "37f41bfc4b09b2e3fe2185e3173f98a42272c05b";
-		};
-	});
 in
 with lib;
 {
@@ -78,7 +68,7 @@ with lib;
 			gnomeExtensions.forge
 			# Themeing
 			gnome.gnome-themes-extra
-			qogir-icon-theme_new
+			papirus-icon-theme
 		];
 
 		# Install Flatpaks
diff --git a/modules/users/common/gnome.nix b/modules/users/common/gnome.nix
index 6b50d73..8f68530 100644
--- a/modules/users/common/gnome.nix
+++ b/modules/users/common/gnome.nix
@@ -19,6 +19,12 @@
 
 			# Configure workspace
 			enable-hot-corners = true;
+
+			# Set icon theme
+			icon-theme = "Papirus-Dark";
+
+			# Set legacy application theme
+			gtk-theme = "Adwaita-dark";
 		};
 
 		# Configure touchpad scroll & tap behavior