diff --git a/firefox-addons/default.nix b/firefox-addons/default.nix index 5191fa0..607a80d 100644 --- a/firefox-addons/default.nix +++ b/firefox-addons/default.nix @@ -1,22 +1,32 @@ -{pkgs, nurpkgs, ...}@args: +{nurpkgs, lib, ...}@args: let -rycee-addons = with nurpkgs.repos.rycee.firefox-addons; [ - ublock-origin - clearurls - cookie-autodelete - istilldontcareaboutcookies - keepassxc-browser - redirector - ublacklist - umatrix - violentmonkey - boring-rss - # bypass-paywalls-clean -]; -own-addons = with import ./derivations.nix args; [ - http-version-indicator - indicatetls - sixindicator -]; + rycee-addons = nurpkgs.repos.rycee.firefox-addons; + own-addons = import ./derivations.nix args; in -rycee-addons ++ own-addons + { + default = lib.concatLists [ + (with rycee-addons; [ + ublock-origin + clearurls + cookie-autodelete + istilldontcareaboutcookies + keepassxc-browser + redirector + ublacklist + umatrix + violentmonkey + boring-rss + # rycee.bypass-paywalls-clean + ]) + (with own-addons; [ + http-version-indicator + indicatetls + sixindicator + ]) + ]; + sue = with rycee-addons; [ + ublock-origin + istilldontcareaboutcookies + keepassxc-browser + ]; + } diff --git a/home.nix b/home.nix index 8847dd9..ef1f0c5 100644 --- a/home.nix +++ b/home.nix @@ -1,6 +1,7 @@ { pkgs, lib, ... }@args: let nurpkgs = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { inherit pkgs; }; + firefox-addons = import ./firefox-addons (args // {inherit nurpkgs; }); in { home = { @@ -55,14 +56,20 @@ in firefox = { enable = true; - profiles.default = { - id = 0; - isDefault = true; - settings = { - "browser.aboutConfig.showWarning" = false; - "browser.toolbars.bookmarks.visibility" = "always"; + profiles = { + default = { + id = 0; + isDefault = true; + settings = { + "browser.aboutConfig.showWarning" = false; + "browser.toolbars.bookmarks.visibility" = "always"; + }; + extensions = firefox-addons.default; # TODO: recursive + }; + sue = { + id = 1; + extensions = firefox-addons.sue; }; - extensions = import ./firefox-addons (args // {inherit nurpkgs; }); }; };