From e71531c974fffee0aca4cde6ae53fda74d829ce7 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 4 Mar 2025 13:02:55 -0500 Subject: seth/firefox: use getchpkgs arkenfox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'getchpkgs': 'github:getchoo/getchpkgs/3b38ad0047bd1402402d6842f05d4a2efcabefeb?narHash=sha256-e9ujVA7YA1EY1PhBFLxXYGXqDihxqvvAFWnSn/RuSic%3D' (2025-02-08) → 'github:getchoo/getchpkgs/bda62257a33b045c1f605c03793d8d5d0a93805b?narHash=sha256-Fq5ZoW0ccF8X4ZE6UWdK28L0WMP7f/Tu2uCKAJ9Bk0o%3D' (2025-03-04) --- users/seth/mixins/default.nix | 2 +- users/seth/mixins/firefox.nix | 84 ++++++++++++++++++++++++++++++++++ users/seth/mixins/firefox/arkenfox.nix | 69 ---------------------------- users/seth/mixins/firefox/default.nix | 65 -------------------------- 4 files changed, 85 insertions(+), 135 deletions(-) create mode 100644 users/seth/mixins/firefox.nix delete mode 100644 users/seth/mixins/firefox/arkenfox.nix delete mode 100644 users/seth/mixins/firefox/default.nix (limited to 'users/seth') diff --git a/users/seth/mixins/default.nix b/users/seth/mixins/default.nix index 1668f23..7d20a17 100644 --- a/users/seth/mixins/default.nix +++ b/users/seth/mixins/default.nix @@ -4,7 +4,7 @@ ./budgie.nix ./catppuccin.nix ./chromium.nix - ./firefox + ./firefox.nix ./fish.nix ./gh.nix ./ghostty.nix diff --git a/users/seth/mixins/firefox.nix b/users/seth/mixins/firefox.nix new file mode 100644 index 0000000..eb0e820 --- /dev/null +++ b/users/seth/mixins/firefox.nix @@ -0,0 +1,84 @@ +{ + lib, + osConfig, + inputs, + ... +}: + +let + usingNvidia = lib.elem "nvidia" osConfig.services.xserver.videoDrivers or [ ]; +in + +{ + imports = [ + inputs.getchpkgs.homeModules.arkenfox + inputs.getchpkgs.homeModules.firefox-addons + ]; + + config = lib.mkMerge [ + { + programs.firefox = { + addons = [ + # uBlock Origin + { id = "uBlock0@raymondhill.net"; } + # Bitwarden + { id = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; } + # Floccus + { id = "floccus@handmadeideas.org"; } + ]; + + profiles.arkenfox = { + arkenfox = { + enable = true; + version = "133.0"; + }; + + isDefault = true; + + settings = { + # Disable Firefox Accounts & Pocket + "extensions.pocket.enabled" = false; + "identity.fxaccounts.enabled" = false; + + # Hardware acceleration + "media.ffmpeg.vaapi.enabled" = true; + + # Widevine drm + "media.gmp-widevinecdm.enabled" = true; + + # === + ## Arkenfox overrides + # === + + # 1201: Fix Hulu + "security.ssl.require_safe_negotiation" = false; + + # 2651: Download to my downloads + "browser.download.useDownloadDir" = true; + + # 5003: I use Bitwarden + "signon.rememberSignons" = true; + # 5021: Enable search from URL bar by default + "keyword.enabled" = true; + }; + }; + }; + } + + # Required workarounds for nvidia-vaapi-driver + # https://github.com/elFarto/nvidia-vaapi-driver?tab=readme-ov-file#firefox + (lib.mkIf usingNvidia { + home.sessionVariables = { + MOZ_DISABLE_RDD_SANDBOX = "1"; + }; + + programs.firefox = { + profiles.arkenfox.settings = { + "media.av1.enabled" = false; + "media.rdd-ffmpeg.enabled" = true; + "widget.dmabuf.force-enabled" = true; + }; + }; + }) + ]; +} diff --git a/users/seth/mixins/firefox/arkenfox.nix b/users/seth/mixins/firefox/arkenfox.nix deleted file mode 100644 index cfb2a0d..0000000 --- a/users/seth/mixins/firefox/arkenfox.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - inputs, - ... -}: - -{ - imports = [ inputs.arkenfox.hmModules.arkenfox ]; - - programs.firefox = { - arkenfox = { - enable = true; - version = "128.0"; - }; - - profiles.arkenfox.arkenfox = - let - enableSections = - sections: - lib.genAttrs sections (_: { - enable = true; - }); - in - lib.recursiveUpdate - { - enable = true; - - # enable safe browsing - "0400"."0403"."browser.safebrowsing.downloads.remote.enabled".value = true; - - # fix hulu - "1200"."1201"."security.ssl.require_safe_negotiation".value = false; - - "2600"."2651"."browser.download.useDownloadDir" = { - enable = true; - value = true; - }; - - # disable rfp letterboxing - "4500"."4504"."privacy.resistFingerprinting.letterboxing".value = false; - - "5000" = { - "5003"."signon.rememberSignons".enable = true; - # enable search autocomplete - "5021"."keyword.enabled".value = true; - }; - } - (enableSections [ - "0100" - "0200" - "0300" - "0400" - "0600" - "0700" - "0800" - "0900" - "1000" - "1200" - "1600" - "1700" - "2000" - "2400" - "2600" - "2700" - "2800" - "4500" - ]); - }; -} diff --git a/users/seth/mixins/firefox/default.nix b/users/seth/mixins/firefox/default.nix deleted file mode 100644 index 10d7026..0000000 --- a/users/seth/mixins/firefox/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - osConfig, - inputs, - ... -}: - -let - usingNvidia = lib.elem "nvidia" osConfig.services.xserver.videoDrivers or [ ]; -in - -{ - imports = [ - inputs.getchpkgs.nixosModules.firefox-addons - # Requires `github:dwarfmaster/arkenfox-nixos` - # ./arkenfox.nix - ]; - - config = lib.mkMerge [ - { - programs.firefox = { - addons = [ - # uBlock Origin - "uBlock0@raymondhill.net" - # Bitwarden - "{446900e4-71c2-419f-a6a7-df9c091e268b}" - # Floccus - "floccus@handmadeideas.org" - ]; - - profiles.arkenfox = { - isDefault = true; - - settings = { - # disable firefox accounts & pocket - "extensions.pocket.enabled" = false; - "identity.fxaccounts.enabled" = false; - - # hw accel - "media.ffmpeg.vaapi.enabled" = true; - - # widevine drm - "media.gmp-widevinecdm.enabled" = true; - }; - }; - }; - } - - # Required workarounds for nvidia-vaapi-driver - # https://github.com/elFarto/nvidia-vaapi-driver?tab=readme-ov-file#firefox - (lib.mkIf usingNvidia { - home.sessionVariables = { - MOZ_DISABLE_RDD_SANDBOX = "1"; - }; - - programs.firefox = { - profiles.arkenfox.settings = { - "media.av1.enabled" = false; - "media.rdd-ffmpeg.enabled" = true; - "widget.dmabuf.force-enabled" = true; - }; - }; - }) - ]; -} -- cgit v1.2.3