From 0a358a8643ee520cfacb5b7af2949efadd78f3f6 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Wed, 30 Aug 2023 00:36:38 +0200
Subject: [PATCH] KeepassXC: install with users.users.<>-packages instead of
 home manager

---
 roles/desktop/programs/keepassxc.nix | 51 +++++++++++++---------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
index 6ffb436..2bff9ed 100644
--- a/roles/desktop/programs/keepassxc.nix
+++ b/roles/desktop/programs/keepassxc.nix
@@ -23,36 +23,33 @@ let
 in
 
 {
-	# I'm only using keepass on my user, so I'm installing it with home-manager
+	users.users.toast.packages = [ pkgs.keepassxc ];
 	home-manager = {
 		extraSpecialArgs = { kpxcSettings = kpxcSettings; };
 		users.toast = { config, pkgs, kpxcSettings, ... }: {
-			home = {
-				packages = [ pkgs.keepassxc ];
-				# No module for KeePassXC config :(
-				file = {
-					".config/keepassxc/keepassxc.ini".text = kpxcSettings;
-					# For some reason the autostart .desktop is not the same as the regular one
-					".config/autostart/org.keepassxc.KeePassXC.desktop".text = ''
-					[Desktop Entry]
-					Name=KeePassXC
-					GenericName=Password Manager
-					Exec=keepassxc
-					TryExec=keepassxc
-					Icon=keepassxc
-					StartupWMClass=keepassxc
-					StartupNotify=true
-					Terminal=false
-					Type=Application
-					Version=1.0
-					Categories=Utility;Security;Qt;
-					MimeType=application/x-keepass2;
-					X-GNOME-Autostart-enabled=true
-					X-GNOME-Autostart-Delay=2
-					X-KDE-autostart-after=panel
-					X-LXQt-Need-Tray=true
-					'';
-				};
+			# No module for KeePassXC config :(
+			home.file = {
+				".config/keepassxc/keepassxc.ini".text = kpxcSettings;
+				# For some reason the autostart .desktop is not the same as the regular one
+				".config/autostart/org.keepassxc.KeePassXC.desktop".text = ''
+				[Desktop Entry]
+				Name=KeePassXC
+				GenericName=Password Manager
+				Exec=keepassxc
+				TryExec=keepassxc
+				Icon=keepassxc
+				StartupWMClass=keepassxc
+				StartupNotify=true
+				Terminal=false
+				Type=Application
+				Version=1.0
+				Categories=Utility;Security;Qt;
+				MimeType=application/x-keepass2;
+				X-GNOME-Autostart-enabled=true
+				X-GNOME-Autostart-Delay=2
+				X-KDE-autostart-after=panel
+				X-LXQt-Need-Tray=true
+				'';
 			};
 		};
 	};