diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index eb8bc43..dfd748a 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -33,22 +33,11 @@
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
 
-	/*# Enable the pipewire sound server
+	# Enable the pipewire sound server
 	services.pipewire = {
 		enable = true;
 		pulse.enable = true;
-	}; /*
-
-	/*
-	Pipewire's audio server seems to be broken for now, so I'm going to
-	temporarely use pulse as my audio server
-	*/
-	services.pipewire = {
-		audio.enable = false;
-		pulse.enable = false;
-		alsa.enable = false;
 	};
-	hardware.pulseaudio.enable = true;
 
 	# Configure keymap in X11
 	# services.xserver.layout = "us";
diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix
index cc53c64..48133e7 100644
--- a/machines/Archie/hardware-configuration.nix
+++ b/machines/Archie/hardware-configuration.nix
@@ -8,6 +8,7 @@
 		[ (modulesPath + "/installer/scan/not-detected.nix")
 		];
 
+	# Enabke  support for the Xbox One wireless dongle
 	# Enable support for the Xbox One wireless dongle
 	hardware.xone.enable = true;
 
@@ -39,22 +40,17 @@
 			fsType = "vfat";
 		};
 
+	/*
+	Mount the root subvolume of the SSD
+	This is helpful for getting things from
+	my old Arch install, as well as for running btdu
+	*/
 	fileSystems = {
-		/*
-		Mount the root subvolume of the SSD
-		This is helpful for getting things from
-		my old Arch install, as well as for running btdu
-		*/
 		"/mnt/ssd" = {
 			device = config.fileSystems."/".device;
 			fsType = config.fileSystems."/".fsType;
 			options = [ "subvolid=5" "ro" ];
 		};
-		"/home" = {
-			device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
-			fsType = "btrfs";
-			options = [ "subvol=@home" "compress=zstd" ];
-		};
 	};
 
 	swapDevices = [ ];
diff --git a/roles/desktop/programs/firefox.nix b/roles/desktop/programs/firefox.nix
index 6871b6f..643f174 100644
--- a/roles/desktop/programs/firefox.nix
+++ b/roles/desktop/programs/firefox.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, pkgs, ... }:
 
 {
 	# System wide firefox settings
@@ -24,8 +24,6 @@
 					"installation_mode" = "normal_installed";
 					"install_url" = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
 				};
-				# Uninstall the kde plasma integration extension if KDE is not installed
-				"plasma-browser-integration@kde.org"."installation_mode" = lib.mkDefault "blocked";
 			};
 			"Preferences" = {
 				# Enable video hardware acceleration
@@ -37,6 +35,20 @@
 					"Value" = true;
 					"Status" = "locked";
 				};
+				# Make firefox use the kde file picker
+				"widget.use-xdg-desktop-portal.file-picker" = {
+					"Value" = 1;
+					"Status" = "default";
+				};
+				/*
+				https://wiki.archlinux.org/title/Firefox#KDE_integration tells me to enable this,
+				but strangely enough doing so makes firefox ask to be set as the default browser
+				every time you start it up, so I'll disable it
+				*/
+				"widget.use-xdg-desktop-portal.mime-handler" = {
+					"Value" = 0;
+					"Status" = "default";
+				};
 			};
 			"PromptForDownloadLocation" = true;
 			# I use an external password manager, so the built in one just bothers me
diff --git a/roles/gaming/steam.nix b/roles/gaming/steam.nix
index 27a1a33..1c71901 100644
--- a/roles/gaming/steam.nix
+++ b/roles/gaming/steam.nix
@@ -7,5 +7,5 @@
 		remotePlay.openFirewall = true;
 	};
 	# Some linux native games (rise of the tomb raider) use alsa for sound
-	services.pipewire.alsa.enable = if config.services.pipewire.pulse.enable == true then true else false;
+	services.pipewire.alsa.enable = true;
 }
diff --git a/roles/kde/programs/default.nix b/roles/kde/programs/default.nix
index fe5c43b..9575dce 100644
--- a/roles/kde/programs/default.nix
+++ b/roles/kde/programs/default.nix
@@ -3,6 +3,5 @@
 {
 	imports = [
 		./kate.nix
-		./firefox.nix
 	];
 }
diff --git a/roles/kde/programs/firefox.nix b/roles/kde/programs/firefox.nix
deleted file mode 100644
index 9892650..0000000
--- a/roles/kde/programs/firefox.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	# KDE specific firefox settings
-	programs.firefox = {
-		policies = {
-			"ExtensionSettings" = {
-				# TODO: Install extensions the NUR instead of from AMO
-				"plasma-browser-integration@kde.org" = {
-					"installation_mode" = "normal_installed";
-					"install_url" = "https://addons.mozilla.org/firefox/downloads/latest/plasma-integration/latest.xpi";
-				};
-			};
-			"Preferences" = {
-				# Make firefox use the kde file picker
-				"widget.use-xdg-desktop-portal.file-picker" = {
-					"Value" = 1;
-					"Status" = "default";
-				};
-				/*
-				https://wiki.archlinux.org/title/Firefox#KDE_integration tells me to enable this,
-				but strangely enough doing so makes firefox ask to be set as the default browser
-				every time you start it up, so I'll disable it
-				*/
-				"widget.use-xdg-desktop-portal.mime-handler" = {
-					"Value" = 0;
-					"Status" = "default";
-				};
-			};
-		};
-	};
-}