diff --git a/.gitignore b/.gitignore
index 3357b94..1df9283 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
 result-*
+
+# ---> Kate
+# Ignore kate's swap files
+*.kate-swp
diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
old mode 100755
new mode 100644
index 6aa4825..cb3d38f
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -2,9 +2,7 @@
 
 {
 	imports = [
-		./discord.nix
-		./firefox.nix
-		./micro.nix
-		./keepassxc.nix
+		./services
+		./programs
 	];
 }
diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix
new file mode 100755
index 0000000..6aa4825
--- /dev/null
+++ b/roles/desktop/programs/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+	imports = [
+		./discord.nix
+		./firefox.nix
+		./micro.nix
+		./keepassxc.nix
+	];
+}
diff --git a/roles/desktop/discord.nix b/roles/desktop/programs/discord.nix
similarity index 100%
rename from roles/desktop/discord.nix
rename to roles/desktop/programs/discord.nix
diff --git a/roles/desktop/firefox.nix b/roles/desktop/programs/firefox.nix
similarity index 100%
rename from roles/desktop/firefox.nix
rename to roles/desktop/programs/firefox.nix
diff --git a/roles/desktop/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
similarity index 98%
rename from roles/desktop/keepassxc.nix
rename to roles/desktop/programs/keepassxc.nix
index 8018453..53f42da 100644
--- a/roles/desktop/keepassxc.nix
+++ b/roles/desktop/programs/keepassxc.nix
@@ -18,6 +18,7 @@ let
 			# monochrome-light, monochrome-dark or colorful
 			TrayIconAppearance = "monochrome-light";
 		};
+		SSHAgent.Enabled = true;
 	};
 in
 
diff --git a/roles/desktop/micro.nix b/roles/desktop/programs/micro.nix
similarity index 100%
rename from roles/desktop/micro.nix
rename to roles/desktop/programs/micro.nix
diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix
new file mode 100644
index 0000000..48f9952
--- /dev/null
+++ b/roles/desktop/services/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+	imports = [
+		./ssh-agent.nix
+	];
+}
diff --git a/roles/desktop/services/ssh-agent.nix b/roles/desktop/services/ssh-agent.nix
new file mode 100644
index 0000000..31b9f73
--- /dev/null
+++ b/roles/desktop/services/ssh-agent.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+	programs.ssh.startAgent = true;
+	/*
+	Home assistant added an option that does this
+	https://github.com/nix-community/home-manager/commit/2d9210f25ed18d5d4e11e6b886de4027c0c51a94
+	but since I still need to fix home-manager's envvars not applying I'll stick to the NixOS one
+	*/
+	/*
+	TODO: fix SSH_AUTH_SOCK not being set in Plasma
+	Turns out the NixOS module also has issues :3
+	The env is set but only in bash, not in the DE, so
+	keepass can't pick it up. For now I'll just set it manually
+	*/
+	home-manager.users.toast.xdg.configFile."plasma-workspace/env/ssh-agent.sh".text = ''
+	if [[ -z "$SSH_AUTH_SOCK" ]]; then
+		export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
+	fi
+	'';
+}