From 3e208d20934bedd8cd7769f23f35cfae9d8e7d0d Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Feb 2025 01:18:47 -0500 Subject: seth: simplify module structure Moving to mixins generally reduces the boilerplate in all configurations, and less custom "stuff" These are then enabled by the regular options in programs.nix for example Many of the other options (like desktops) also had little use in being abstracted as there's no situation where I'd *not* want them to be applied when said desktop is in use --- users/seth/programs/firefox/arkenfox.nix | 80 -------------------------------- users/seth/programs/firefox/default.nix | 55 ---------------------- 2 files changed, 135 deletions(-) delete mode 100644 users/seth/programs/firefox/arkenfox.nix delete mode 100644 users/seth/programs/firefox/default.nix (limited to 'users/seth/programs/firefox') diff --git a/users/seth/programs/firefox/arkenfox.nix b/users/seth/programs/firefox/arkenfox.nix deleted file mode 100644 index 8ae4af3..0000000 --- a/users/seth/programs/firefox/arkenfox.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - config, - lib, - inputs, - ... -}: -let - cfg = config.seth.programs.firefox.arkenfox; -in -{ - imports = [ inputs.arkenfox.hmModules.arkenfox ]; - - options.seth.programs.firefox.arkenfox = { - enable = lib.mkEnableOption "Arkenfox settings for Firefox" // { - default = true; - }; - }; - - config = lib.mkIf cfg.enable { - 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/programs/firefox/default.nix b/users/seth/programs/firefox/default.nix deleted file mode 100644 index 3eff2f3..0000000 --- a/users/seth/programs/firefox/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - config, - lib, - inputs, - ... -}: -let - cfg = config.seth.programs.firefox; -in -{ - options.seth.programs.firefox = { - enable = lib.mkEnableOption "Firefox configuration"; - }; - - imports = [ - inputs.getchpkgs.nixosModules.firefox-addons - # Requires `github:dwarfmaster/arkenfox-nixos` - # ./arkenfox.nix - ]; - - config = lib.mkIf cfg.enable { - home.sessionVariables = { - MOZ_ENABLE_WAYLAND = "1"; - }; - - programs.firefox = { - enable = true; - - 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; - }; - }; - }; - }; -} -- cgit v1.2.3