diff --git a/.gitignore b/.gitignore
index 1df9283..3357b94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,3 @@
 # 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 100644
new mode 100755
index cb3d38f..6aa4825
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -2,7 +2,9 @@
 
 {
 	imports = [
-		./services
-		./programs
+		./discord.nix
+		./firefox.nix
+		./micro.nix
+		./keepassxc.nix
 	];
 }
diff --git a/roles/desktop/programs/discord.nix b/roles/desktop/discord.nix
similarity index 100%
rename from roles/desktop/programs/discord.nix
rename to roles/desktop/discord.nix
diff --git a/roles/desktop/programs/firefox.nix b/roles/desktop/firefox.nix
similarity index 100%
rename from roles/desktop/programs/firefox.nix
rename to roles/desktop/firefox.nix
diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/keepassxc.nix
similarity index 98%
rename from roles/desktop/programs/keepassxc.nix
rename to roles/desktop/keepassxc.nix
index 53f42da..8018453 100644
--- a/roles/desktop/programs/keepassxc.nix
+++ b/roles/desktop/keepassxc.nix
@@ -18,7 +18,6 @@ let
 			# monochrome-light, monochrome-dark or colorful
 			TrayIconAppearance = "monochrome-light";
 		};
-		SSHAgent.Enabled = true;
 	};
 in
 
diff --git a/roles/desktop/programs/micro.nix b/roles/desktop/micro.nix
similarity index 100%
rename from roles/desktop/programs/micro.nix
rename to roles/desktop/micro.nix
diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix
deleted file mode 100755
index 6aa4825..0000000
--- a/roles/desktop/programs/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./discord.nix
-		./firefox.nix
-		./micro.nix
-		./keepassxc.nix
-	];
-}
diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix
deleted file mode 100644
index 48f9952..0000000
--- a/roles/desktop/services/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./ssh-agent.nix
-	];
-}
diff --git a/roles/desktop/services/ssh-agent.nix b/roles/desktop/services/ssh-agent.nix
deleted file mode 100644
index 31b9f73..0000000
--- a/roles/desktop/services/ssh-agent.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ 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
-	'';
-}