mirror of
https://github.com/nix-community/home-manager
synced 2025-01-30 21:05:02 +01:00
firefox: add preConfig
Add `preConfig`, which acts like `extraConfig`, but placed before `settings`. This will allow to overwrite settings in `preConfig`, using `settings` option.
This commit is contained in:
parent
bd530df4e2
commit
0ee8bfdd04
7 changed files with 93 additions and 5 deletions
|
@ -1972,6 +1972,19 @@ in {
|
|||
'yazi' alias.
|
||||
'';
|
||||
}
|
||||
|
||||
{
|
||||
time = "2025-01-29T17:34:53+00:00";
|
||||
condition = config.programs.firefox.enable;
|
||||
message = ''
|
||||
The Firefox module now provides a
|
||||
'programs.firefox.profiles.<name>.preConfig' option.
|
||||
|
||||
It allows extra preferences to be added to 'user.js' before the
|
||||
options specified in 'programs.firefox.profiles.<name>.settings', so
|
||||
that they can be overwritten.
|
||||
'';
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -75,7 +75,7 @@ let
|
|||
else
|
||||
builtins.toJSON pref);
|
||||
|
||||
mkUserJs = prefs: extraPrefs: bookmarks:
|
||||
mkUserJs = prePrefs: prefs: extraPrefs: bookmarks:
|
||||
let
|
||||
prefs' = lib.optionalAttrs ([ ] != bookmarks) {
|
||||
"browser.bookmarks.file" = toString (browserBookmarksFile bookmarks);
|
||||
|
@ -84,6 +84,8 @@ let
|
|||
in ''
|
||||
// Generated by Home Manager.
|
||||
|
||||
${prePrefs}
|
||||
|
||||
${concatStrings (mapAttrsToList (name: value: ''
|
||||
user_pref("${name}", ${userPrefValue value});
|
||||
'') prefs')}
|
||||
|
@ -369,6 +371,20 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
preConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra preferences to add to {file}`user.js`, before
|
||||
[](#opt-programs.firefox.profiles._name_.settings).
|
||||
|
||||
Use [](#opt-programs.firefox.profiles._name_.extraConfig), unless
|
||||
you want to overwrite in
|
||||
[](#opt-programs.firefox.profiles._name_.settings), then use this
|
||||
option.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.attrsOf (jsonFormat.type // {
|
||||
description =
|
||||
|
@ -768,10 +784,11 @@ in {
|
|||
"${profilesPath}/${profile.path}/chrome/userContent.css" =
|
||||
mkIf (profile.userContent != "") { text = profile.userContent; };
|
||||
|
||||
"${profilesPath}/${profile.path}/user.js" = mkIf (profile.settings != { }
|
||||
|| profile.extraConfig != "" || profile.bookmarks != [ ]) {
|
||||
text =
|
||||
mkUserJs profile.settings profile.extraConfig profile.bookmarks;
|
||||
"${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig != ""
|
||||
|| profile.settings != { } || profile.extraConfig != ""
|
||||
|| profile.bookmarks != [ ]) {
|
||||
text = mkUserJs profile.preConfig profile.settings profile.extraConfig
|
||||
profile.bookmarks;
|
||||
};
|
||||
|
||||
"${profilesPath}/${profile.path}/containers.json" =
|
||||
|
|
|
@ -10,6 +10,7 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) {
|
|||
"${name}-profiles-containers-id-out-of-range" =
|
||||
./profiles/containers/id-out-of-range.nix;
|
||||
"${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
|
||||
"${name}-profiles-overwrite" = ./profiles/overwrite;
|
||||
"${name}-profiles-search" = ./profiles/search;
|
||||
"${name}-profiles-settings" = ./profiles/settings;
|
||||
"${name}-state-version-19_09" = ./state-version-19_09.nix;
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
// Generated by Home Manager.
|
||||
|
||||
|
||||
|
||||
user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-@name@-bookmarks.html");
|
||||
user_pref("browser.places.importBookmarksHTML", true);
|
||||
user_pref("general.smoothScroll", false);
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
modulePath:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = getAttrFromPath modulePath config;
|
||||
|
||||
firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
|
||||
|
||||
in {
|
||||
imports = [ firefoxMockOverlay ];
|
||||
|
||||
config = mkIf config.test.enableBig (setAttrByPath modulePath {
|
||||
enable = true;
|
||||
profiles = {
|
||||
basic.isDefault = true;
|
||||
test = {
|
||||
id = 6;
|
||||
preConfig = ''
|
||||
user_pref("browser.search.suggest.enabled", false);
|
||||
'';
|
||||
settings = { "browser.search.suggest.enabled" = true; };
|
||||
extraConfig = ''
|
||||
user_pref("findbar.highlightAll", true);
|
||||
'';
|
||||
};
|
||||
};
|
||||
} // {
|
||||
nmt.script = ''
|
||||
assertFileRegex \
|
||||
home-path/bin/${cfg.wrappedPackageName} \
|
||||
MOZ_APP_LAUNCHER
|
||||
|
||||
assertDirectoryExists home-files/${cfg.configPath}/basic
|
||||
|
||||
assertFileContent \
|
||||
home-files/${cfg.configPath}/test/user.js \
|
||||
${./expected-user.js}
|
||||
'';
|
||||
});
|
||||
}
|
|
@ -0,0 +1,10 @@
|
|||
// Generated by Home Manager.
|
||||
|
||||
user_pref("browser.search.suggest.enabled", false);
|
||||
|
||||
|
||||
user_pref("browser.search.suggest.enabled", true);
|
||||
|
||||
|
||||
user_pref("findbar.highlightAll", true);
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
// Generated by Home Manager.
|
||||
|
||||
|
||||
|
||||
user_pref("browser.newtabpage.pinned", "[{\"title\":\"NixOS\",\"url\":\"https://nixos.org\"}]");
|
||||
user_pref("general.smoothScroll", false);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue