diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index f91582d..c01b561 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -65,7 +65,6 @@
 		isNormalUser = true;
 		extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
 		packages = with pkgs; [
-			firefox
 			tree
 		];
 	};
diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
index 52f5478..b13a242 100755
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -3,5 +3,6 @@
 {
 	imports = [
 		./discord.nix
+		./firefox.nix
 	];
 }
diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix
new file mode 100644
index 0000000..797fd9e
--- /dev/null
+++ b/roles/desktop/firefox.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, ... }:
+
+{
+	# System wide firefox settings
+	programs.firefox = {
+		enable = true;
+		policies = {
+			"DisablePocket" = true;
+			"DisableTelemetry" = true;
+			# You need these for Spotify
+			"EncryptedMediaExtensions" = { "Enabled" = true; };
+			"ExtensionSettings" = {
+				# TODO: Install extensions the NUR instead of from AMO
+				"uBlock0@raymondhill.net" = {
+					"installation_mode" = "force_installed";
+					"install_url" = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+				};
+				# Decentraleyes
+				"jid1-BoFifL9Vbdl2zQ@jetpack" = {
+					"installation_mode" = "normal_installed";
+					"install_url" = "https://addons.mozilla.org/firefox/downloads/latest/decentraleyes/latest.xpi";
+				};
+				"jid1-MnnxcxisBPnSXQ@jetpack" = {
+					"installation_mode" = "normal_installed";
+					"install_url" = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
+				};
+			};
+			"Preferences" = {
+				# Enable video hardware acceleration
+				"media.ffmpeg.vaapi.enabled" = {
+					"Value" = true;
+					"Status" = "default";
+				};
+			};
+			"Permissions" = {
+				"Autoplay" = {
+					"Allow" = [ "https://www.youtube.com" ];
+					"Default" = "block-audio-video";
+				};
+			};
+			"FirefoxHome" = { "SponsoredTopSites" = false; };
+		};
+	};
+}