mirror of
https://github.com/nix-community/home-manager.git
synced 2025-12-06 00:51:04 +01:00
firefox: don't show migration warning when bookmarks isn't set (#6689)
This commit is contained in:
parent
4f4538467f
commit
ad0614a1ec
1 changed files with 20 additions and 16 deletions
|
|
@ -383,6 +383,7 @@ in {
|
||||||
bookmarks = mkOption {
|
bookmarks = mkOption {
|
||||||
type = (with types;
|
type = (with types;
|
||||||
coercedTo bookmarkTypes.settingsType (bookmarks:
|
coercedTo bookmarkTypes.settingsType (bookmarks:
|
||||||
|
if bookmarks != { } then
|
||||||
warn ''
|
warn ''
|
||||||
${cfg.name} bookmarks have been refactored into a submodule that now explicitly require a 'force' option to be enabled.
|
${cfg.name} bookmarks have been refactored into a submodule that now explicitly require a 'force' option to be enabled.
|
||||||
|
|
||||||
|
|
@ -399,10 +400,13 @@ in {
|
||||||
'' {
|
'' {
|
||||||
force = true;
|
force = true;
|
||||||
settings = bookmarks;
|
settings = bookmarks;
|
||||||
}) (submodule ({ config, ... }:
|
}
|
||||||
|
else
|
||||||
|
{ }) (submodule ({ config, ... }:
|
||||||
import ./profiles/bookmarks.nix {
|
import ./profiles/bookmarks.nix {
|
||||||
inherit config lib pkgs;
|
inherit config lib pkgs;
|
||||||
modulePath = modulePath ++ [ "profiles" name "bookmarks" ];
|
modulePath = modulePath
|
||||||
|
++ [ "profiles" name "bookmarks" ];
|
||||||
})));
|
})));
|
||||||
default = { };
|
default = { };
|
||||||
internal = !enableBookmarks;
|
internal = !enableBookmarks;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue