diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix
index 8cd3198..fd2f6de 100755
--- a/machines/Everest/configuration.nix
+++ b/machines/Everest/configuration.nix
@@ -48,24 +48,13 @@
 	boot.tmp.useTmpfs = false;
 
 	home-manager = {
-		backupFileExtension = "backup";
-		useGlobalPkgs = true;
 		users.toast = { config, ... }: {
 			home = {
-				stateVersion = "23.05";
 				file = {
 					# This symlinks the Transmission downloads folder into my user's downloads folder for easy access
 					"Downloads/Transmission".source = config.lib.file.mkOutOfStoreSymlink "/var/lib/transmission/Downloads";
 				};
 			};
-			xdg = {
-				#enable = true;
-				userDirs = {
-					enable = true;
-					createDirectories = true;
-					publicShare = null; # Disable the public folder
-				};
-			};
 		};
 	};
 
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index c8c6697..2be5714 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -49,6 +49,21 @@
 	# Set up time zone.
 	time.timeZone = "Europe/Madrid";
 
+	home-manager = {
+		backupFileExtension = "hm-backup";
+		useGlobalPkgs = true;
+		users.toast = { config, ... }: {
+			home.stateVersion = "23.05";
+			xdg = {
+				userDirs = {
+					enable = true;
+					createDirectories = true;
+					publicShare = null; # Disable the public folder
+				};
+			};
+		};
+	};
+
 	# Set up secrets
 	age = {
 		identityPaths = [ 
diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
index 53f42da..6ffb436 100644
--- a/roles/desktop/programs/keepassxc.nix
+++ b/roles/desktop/programs/keepassxc.nix
@@ -25,18 +25,9 @@ in
 {
 	# I'm only using keepass on my user, so I'm installing it with home-manager
 	home-manager = {
-		/*
-		TODO: move home-manager settings into the common role
-		They are not keepass specific, so they really should
-		not be here. I'm too lazy to do it now tho :P
-		*/
-		backupFileExtension = "backup";
-		useGlobalPkgs = true;
-
 		extraSpecialArgs = { kpxcSettings = kpxcSettings; };
 		users.toast = { config, pkgs, kpxcSettings, ... }: {
 			home = {
-				stateVersion = "23.05";
 				packages = [ pkgs.keepassxc ];
 				# No module for KeePassXC config :(
 				file = {
@@ -63,7 +54,6 @@ in
 					'';
 				};
 			};
-
 		};
 	};
 }