From e97ba17b86ed4cdc8df673dfc68b447416a74b55 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 15 Feb 2023 03:36:58 -0500
Subject: fix gpg-agent and cleanup a few things

---
 hosts/common/packages.nix                         | 14 +++++++++++---
 users/seth/programs/git.nix                       |  3 +++
 users/seth/programs/mangohud/MangoHud.conf        |  9 +++++++++
 users/seth/programs/mangohud/config/MangoHud.conf |  9 ---------
 users/seth/programs/mangohud/default.nix          |  3 +--
 5 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 users/seth/programs/mangohud/MangoHud.conf
 delete mode 100644 users/seth/programs/mangohud/config/MangoHud.conf

diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 0cf093c..a2f5c15 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -7,22 +7,30 @@
 		if config.sys.gui.enable
 		then with pkgs; [firefox]
 		else [];
+
+	pinentry =
+		if config.sys.desktop == "gnome"
+		then pkgs.pinentry-gnome
+		else pkgs.pinentry-curses;
 in {
 	environment.systemPackages = with pkgs;
 		[
 			git
 			neofetch
-			pinentry-curses
 			python310
 			vim
 		]
-		++ extraPkgs;
+		++ extraPkgs
+		++ [pinentry];
 
 	programs = {
 		gnupg = {
 			agent = {
 				enable = true;
-				pinentryFlavor = "curses";
+				pinentryFlavor =
+					if config.sys.desktop == "gnome"
+					then "gnome3"
+					else "curses";
 			};
 		};
 	};
diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix
index cd3274f..73269fd 100644
--- a/users/seth/programs/git.nix
+++ b/users/seth/programs/git.nix
@@ -12,4 +12,7 @@
 		userEmail = "getchoo@tuta.io";
 		userName = "seth";
 	};
+	services.gpg-agent.extraConfig = ''
+		pinentry-program /run/current-system/sw/bin/pinentry
+	'';
 }
diff --git a/users/seth/programs/mangohud/MangoHud.conf b/users/seth/programs/mangohud/MangoHud.conf
new file mode 100644
index 0000000..8e02a99
--- /dev/null
+++ b/users/seth/programs/mangohud/MangoHud.conf
@@ -0,0 +1,9 @@
+legacy_layout=false
+cpu_stats
+cpu_temp
+gpu_stats
+gpu_temp
+fps
+frametime
+media_player
+media_player_name = spotify
diff --git a/users/seth/programs/mangohud/config/MangoHud.conf b/users/seth/programs/mangohud/config/MangoHud.conf
deleted file mode 100644
index 8e02a99..0000000
--- a/users/seth/programs/mangohud/config/MangoHud.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-legacy_layout=false
-cpu_stats
-cpu_temp
-gpu_stats
-gpu_temp
-fps
-frametime
-media_player
-media_player_name = spotify
diff --git a/users/seth/programs/mangohud/default.nix b/users/seth/programs/mangohud/default.nix
index ff240b8..a2f0933 100644
--- a/users/seth/programs/mangohud/default.nix
+++ b/users/seth/programs/mangohud/default.nix
@@ -10,8 +10,7 @@
 	mangohudConf =
 		if config.seth.desktop != ""
 		then {
-			source = ./config;
-			recursive = true;
+			source = ./MangoHud.conf;
 		}
 		else {};
 in {
-- 
cgit v1.2.3