From db0ce6eadd98c9619ca97719f783f283b0a70c7b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 26 Jun 2023 23:22:45 +0000 Subject: [PATCH] web-browser: don't apply librewolf prefs to firefox deployments --- hosts/common/programs/web-browser.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/common/programs/web-browser.nix b/hosts/common/programs/web-browser.nix index 5c0f5a47..bc272ef0 100644 --- a/hosts/common/programs/web-browser.nix +++ b/hosts/common/programs/web-browser.nix @@ -13,6 +13,7 @@ let # allow easy switching between firefox and librewolf with `defaultSettings`, below librewolfSettings = { browser = pkgs.librewolf-unwrapped; + extraPrefsFiles = pkgs.librewolf-unwrapped.extraPrefsFiles ++ pkgs.librewolf-pmos-mobile.extraPrefsFiles; libName = "librewolf"; dotDir = ".librewolf"; cacheDir = ".cache/librewolf"; @@ -20,6 +21,7 @@ let }; firefoxSettings = { browser = pkgs.firefox-esr-unwrapped; + extraPrefsFiles = pkgs.firefox-pmos-mobile.extraPrefsFiles; libName = "firefox"; dotDir = ".mozilla/firefox"; cacheDir = ".cache/mozilla"; @@ -43,8 +45,7 @@ let package = pkgs.wrapFirefox cfg.browser.browser { # inherit the default librewolf.cfg # it can be further customized via ~/.librewolf/librewolf.overrides.cfg - inherit (cfg.browser) libName; - extraPrefsFiles = pkgs.librewolf-unwrapped.extraPrefsFiles ++ pkgs.librewolf-pmos-mobile.extraPrefsFiles; + inherit (cfg.browser) extraPrefsFiles libName; extraNativeMessagingHosts = optional cfg.addons.browserpass-extension.enable pkgs.browserpass; # extraNativeMessagingHosts = [ pkgs.gopass-native-messaging-host ];