nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-10 02:51:05 +01:00
Code Activity

firefox: add preConfig

Browse source 
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:
Danil Suetin 2024-07-11 14:27:27 +02:00 • committed by Robert Helgesson
parent bd530df4e2
commit 0ee8bfdd04
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
7 changed files with 93 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/misc/news.nix
View file

@ -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.
'';
}
];
};
}

27
modules/programs/firefox/mkFirefoxModule.nix
View file

@ -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" =