diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix index 314fc3993..3c89b96c7 100644 --- a/modules/programs/firefox.nix +++ b/modules/programs/firefox.nix @@ -97,13 +97,14 @@ let directoryToHTML = indentLevel: directory: '' ${indent indentLevel}
${ if directory.toolbar then - ''

Bookmarks Toolbar'' + '' +

Bookmarks Toolbar'' else - "

${escapeXML directory.name}" + ''

${escapeXML directory.name}'' }

${indent indentLevel}

${allItemsToHTML (indentLevel + 1) directory.bookmarks} - ${indent indentLevel}

''; + ${indent indentLevel}

''; itemToHTMLOrRecurse = indentLevel: item: if item ? "url" then @@ -126,7 +127,7 @@ let

Bookmarks Menu

${bookmarkEntries} -

+ ''; mkNoDuplicateAssertion = entities: entityKind: @@ -377,7 +378,11 @@ in { toolbar = mkOption { type = types.bool; default = false; - description = "If directory should be shown in toolbar."; + description = '' + Make this the toolbar directory. Note, this does _not_ + mean that this directory will be added to the toolbar, + this directory _is_ the toolbar. + ''; }; }; }) // { diff --git a/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html b/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html index 96a540c23..d19eab612 100644 --- a/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html +++ b/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html @@ -6,20 +6,20 @@ Bookmarks

Bookmarks Menu

-

Bookmarks Toolbar

+

Bookmarks Toolbar

Home Manager -

+

wikipedia
kernel.org -

Nix sites

+

Nix sites

homepage
wiki -

Nix sites

+

Nix sites

homepage
wiki -

-

-

+

+

+