mirrors/home-manager
mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-04-06 00:53:34 +00:00
Code Activity

firefox: don't show migration warning when bookmarks isn't set (#6689)

Browse source
This commit is contained in:
Kira Bruneau 2025-03-23 19:13:55 -04:00 • committed by GitHub
parent 4f4538467f
commit ad0614a1ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -383,27 +383,31 @@ in {
bookmarks = mkOption {
type = (with types;
coercedTo bookmarkTypes.settingsType (bookmarks:
warn ''
${cfg.name} bookmarks have been refactored into a submodule that now explicitly require a 'force' option to be enabled.
if bookmarks != { } then
warn ''
${cfg.name} bookmarks have been refactored into a submodule that now explicitly require a 'force' option to be enabled.
Replace:
Replace:
${moduleName}.profiles.${name}.bookmarks = [ ... ];
${moduleName}.profiles.${name}.bookmarks = [ ... ];
With:
With:
${moduleName}.profiles.${name}.bookmarks = {
${moduleName}.profiles.${name}.bookmarks = {
force = true;
settings = [ ... ];
};
'' {
force = true;
settings = [ ... ];
};
'' {
force = true;
settings = bookmarks;
}) (submodule ({ config, ... }:
import ./profiles/bookmarks.nix {
inherit config lib pkgs;
modulePath = modulePath ++ [ "profiles" name "bookmarks" ];
})));
settings = bookmarks;
}
else
{ }) (submodule ({ config, ... }:
import ./profiles/bookmarks.nix {
inherit config lib pkgs;
modulePath = modulePath
++ [ "profiles" name "bookmarks" ];
})));
default = { };
internal = !enableBookmarks;
description = "Declarative bookmarks.";