From fd0ef3be5b47c4276065ba835662a1816ee441f3 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 21 Jun 2023 17:31:43 +0200 Subject: [PATCH 01/11] Enable firefox and disable Pocket --- machines/Archie/configuration.nix | 1 - roles/desktop/default.nix | 1 + roles/desktop/firefox.nix | 11 +++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 roles/desktop/firefox.nix 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..ffc50f5 --- /dev/null +++ b/roles/desktop/firefox.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + # System wide firefox settings + programs.firefox = { + enable = true; + policies = { + "DisablePocket" = true; + }; + }; +} From b7c99f3fea8e0302a7ef2d691cae82a242bed217 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 21 Jun 2023 17:44:24 +0200 Subject: [PATCH 02/11] Firefox: enable video hardware acceleration by default --- roles/desktop/firefox.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index ffc50f5..23aaab0 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -6,6 +6,13 @@ enable = true; policies = { "DisablePocket" = true; + "Preferences" = { + # Enable video hardware acceleration + "media.ffmpeg.vaapi.enabled" = { + "Value" = true; + "Status" = "default"; + }; + }; }; }; } From 06d11340a86746362d456fcdd965df3e004520fb Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 20:17:06 +0200 Subject: [PATCH 03/11] Firefox: disable telemetry --- roles/desktop/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index 23aaab0..e4165db 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -6,6 +6,7 @@ enable = true; policies = { "DisablePocket" = true; + "DisableTelemetry" = true; "Preferences" = { # Enable video hardware acceleration "media.ffmpeg.vaapi.enabled" = { From 6c64366a42d0baa7821bf851ae789d123c21734c Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 20:17:49 +0200 Subject: [PATCH 04/11] Firefox: set default autoplay permissions --- roles/desktop/firefox.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index e4165db..fa2e96f 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -14,6 +14,12 @@ "Status" = "default"; }; }; + "Permissions" = { + "Autoplay" = { + "Allow" = [ "https://www.youtube.com" ]; + "Default" = "block-audio-video"; + }; + }; }; }; } From a167ea6dd116ba97c73e914ecae7daa31ce74372 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 20:18:31 +0200 Subject: [PATCH 05/11] Firefox: enable DRM --- roles/desktop/firefox.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index fa2e96f..095d45f 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -7,6 +7,8 @@ policies = { "DisablePocket" = true; "DisableTelemetry" = true; + # You need these for Spotify + "EncryptedMediaExtensions" = { "Enabled" = true; }; "Preferences" = { # Enable video hardware acceleration "media.ffmpeg.vaapi.enabled" = { From c5937bf9b6f3a2b9cf64d5bf6c3b90d85604d47e Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 20:26:22 +0200 Subject: [PATCH 06/11] Firefox: enable uBlock origin --- roles/desktop/firefox.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index 095d45f..33830ff 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -9,6 +9,13 @@ "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"; + }; + }; "Preferences" = { # Enable video hardware acceleration "media.ffmpeg.vaapi.enabled" = { From 762d43bd91e5e74181dd30fd5f14e0c8ae79002c Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 21:11:17 +0200 Subject: [PATCH 07/11] Firefox: add extensions --- roles/desktop/firefox.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index 33830ff..aaed591 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -15,6 +15,15 @@ "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 From 26a6a74bc630e091b705c3bfda13ada93b0e50a6 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 21:21:45 +0200 Subject: [PATCH 08/11] Firefox: disable sponsored links in home page --- roles/desktop/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/desktop/firefox.nix b/roles/desktop/firefox.nix index aaed591..797fd9e 100644 --- a/roles/desktop/firefox.nix +++ b/roles/desktop/firefox.nix @@ -38,6 +38,7 @@ "Default" = "block-audio-video"; }; }; + "FirefoxHome" = { "SponsoredTopSites" = false; }; }; }; } From 0b0e52e0c5b1c74504d4de4f17d99194cdc4027a Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 23:04:39 +0200 Subject: [PATCH 09/11] Update lock file --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index edfb100..da2aae1 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1687041925, - "narHash": "sha256-Zfn/SphInZ9PEIHWdQk+wGQ0XGlwAgRUp/Qso+8vDOY=", + "lastModified": 1687163790, + "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8d549351d4b87ab80665f35e57bee2a04201245", + "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337", "type": "github" }, "original": { @@ -81,11 +81,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686921029, - "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "lastModified": 1687379288, + "narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3", "type": "github" }, "original": { From 5dec9fe288f788a45ea0e5d0541dfcfab4674f12 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 22 Jun 2023 23:12:45 +0200 Subject: [PATCH 10/11] Archie: use unstable home-manager --- flake.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 8c8c19f..5b5c277 100755 --- a/flake.nix +++ b/flake.nix @@ -13,13 +13,20 @@ agenix = { }; }; -home-manager.url = "github:nix-community/home-manager/release-23.05"; -home-manager.inputs.nixpkgs.follows = "nixpkgs"; +home-manager = { + url = "github:nix-community/home-manager/release-23.05"; + inputs.nixpkgs.follows = "nixpkgs"; +}; + +home-manager-unstable = { + url = "github:nix-community/home-manager/"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; +}; nix-impermanence.url = "github:nix-community/impermanence"; }; -outputs = {nixpkgs, agenix, home-manager, nixpkgs-unstable, nix-impermanence, ... }: { +outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nix-impermanence, ... }: { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { name = "Environment for toast's nixos configurations"; # The agenix cli is not needed to activate a configuration, so instead of installing it @@ -54,7 +61,7 @@ outputs = {nixpkgs, agenix, home-manager, nixpkgs-unstable, nix-impermanence, .. # Needed for nix-index { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } agenix.nixosModules.default - home-manager.nixosModule + home-manager-unstable.nixosModule ./roles/common ./roles/desktop ./roles/kde From 0de81c94068c6ea2bf80b92147d2910efa47ddec Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 26 Jun 2023 18:17:22 +0200 Subject: [PATCH 11/11] Add unstable home-manager to flake.lock (oops) --- flake.lock | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/flake.lock b/flake.lock index da2aae1..a4098ff 100644 --- a/flake.lock +++ b/flake.lock @@ -43,6 +43,26 @@ "type": "github" } }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1687647343, + "narHash": "sha256-1/o/i9KEFOBdlF9Cs04kBcqDFbYMt6W4SMqGa+QnnaI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "0ee5ab611dc1fbb5180bd7d88d2aeb7841a4d179", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -113,6 +133,7 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", + "home-manager-unstable": "home-manager-unstable", "nix-impermanence": "nix-impermanence", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable"