mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2024-12-14 11:57:55 +00: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
parent d00c6f6d0a
commit ea39bf9733
No known key found for this signature in database
GPG key ID: 9076417E3D01C1B0
6 changed files with 78 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
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,18 @@ in {
'';
};
preConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra preferences to add to {file}`user.js`, before
[{option}`programs.firefox.profiles.<profile>.settings`](#opt-programs.firefox.profiles._name_.settings).
Use [{option}`programs.firefox.profiles.<profile>.extraConfig`](#opt-programs.firefox.profiles._name_.extraConfig),
unless you want to overwrite in
[{option}`programs.firefox.profiles.<profile>.settings`](#opt-programs.firefox.profiles._name_.settings)
'';
};
settings = mkOption {
type = types.attrsOf (jsonFormat.type // {
description =
@ -768,10 +782,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" =

1
tests/modules/programs/firefox/common.nix
View file

@ -9,6 +9,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;

2
tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
View file

@ -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);

43
tests/modules/programs/firefox/profiles/overwrite/default.nix Normal file
View file

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

10
tests/modules/programs/firefox/profiles/overwrite/expected-user.js Normal file
View file

@ -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);

2
tests/modules/programs/firefox/profiles/settings/expected-user.js
View file

@ -1,5 +1,7 @@
// Generated by Home Manager.
user_pref("browser.newtabpage.pinned", "[{\"title\":\"NixOS\",\"url\":\"https://nixos.org\"}]");
user_pref("general.smoothScroll", false);