diff --git a/modules/programs/firefox/profiles/bookmark-types.nix b/modules/programs/firefox/profiles/bookmark-types.nix index ff6b88cea..b26aa4005 100644 --- a/modules/programs/firefox/profiles/bookmark-types.nix +++ b/modules/programs/firefox/profiles/bookmark-types.nix @@ -1,8 +1,11 @@ { lib, ... }: -with lib; +let -rec { + inherit (builtins) attrValues; + inherit (lib) types mkOption; + +in rec { settingsType = with types; coercedTo (addCheck (attrsOf nodeType) (attrs: !(attrs ? settings))) attrValues (listOf nodeType); diff --git a/modules/programs/firefox/profiles/bookmarks.nix b/modules/programs/firefox/profiles/bookmarks.nix index 130677f5a..bfdd43716 100644 --- a/modules/programs/firefox/profiles/bookmarks.nix +++ b/modules/programs/firefox/profiles/bookmarks.nix @@ -1,12 +1,13 @@ { config, lib, pkgs, modulePath }: -with lib; - let - bookmarkTypes = import ./bookmark-types.nix { inherit lib; }; + inherit (lib) + escapeXML concatStringsSep mkOption maintainers types literalExpression; inherit (bookmarkTypes) settingsType; + bookmarkTypes = import ./bookmark-types.nix { inherit lib; }; + bookmarksFile = bookmarks: let indent = level: