Refactor the whole configuration #1

Merged
caem merged 354 commits from refactor into master 2025-02-01 14:05:16 +01:00
2 changed files with 4 additions and 3 deletions
Showing only changes of commit 1d73fdb5da - Show all commits

View file

@ -5,7 +5,7 @@ let
else if (builtins.isInt value) || (builtins.isNull value) then else if (builtins.isInt value) || (builtins.isNull value) then
builtins.toString value builtins.toString value
else if builtins.isString value then else if builtins.isString value then
value ''"${value}"''
else else
builtins.throw builtins.throw
"Pref expected one of (Bool, String, Int, Null) got instead ${builtins.typeOf value}"; "Pref expected one of (Bool, String, Int, Null) got instead ${builtins.typeOf value}";
@ -14,7 +14,7 @@ let
"\n" "\n"
(builtins.attrValues (builtins.attrValues
(builtins.mapAttrs (builtins.mapAttrs
(n: v: ''user_pref("${n}", "${(prefToString v)}");'') prefs)); (n: v: ''user_pref("${n}", ${prefToString v});'') prefs));
in in
mkPrefs { mkPrefs {
"browser.urlbar.suggest.topsites" = false; "browser.urlbar.suggest.topsites" = false;

View file

@ -15,7 +15,8 @@
prefsFile = "${cfgPath}/modules/nixos/multimedia/web/firefox/preferences.nix"; prefsFile = "${cfgPath}/modules/nixos/multimedia/web/firefox/preferences.nix";
in prev.firefox-esr.override { in prev.firefox-esr.override {
extraPolicies = import policiesFile; extraPolicies = import policiesFile;
extraPrefs = builtins.trace (import prefsFile) (import prefsFile); # extraPrefs = builtins.trace (import prefsFile) (import prefsFile);
extraPrefs = "";
}; };
sandboxed-firefox-esr = prev.mkNixPak { sandboxed-firefox-esr = prev.mkNixPak {