firefox: support nested folders in bookmarks (nix-community#3112)

wuyoli · Aug 27, 2022 · 375631f · 375631f
1 parent 0884d6c
commit 375631f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
@@ -288,7 +288,7 @@ in {
                     };
 
                     bookmarks = mkOption {
-                      type = types.listOf bookmarkType;
+                      type = types.listOf nodeType;
                       default = [ ];
                       description = "Bookmarks within directory.";
                     };

diff --git a/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html b/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
@@ -16,5 +16,11 @@ <H1>Bookmarks Menu</H1>
   <DL><p>
     <DT><A HREF="https://nixos.org/" ADD_DATE="0" LAST_MODIFIED="0">homepage</A>
     <DT><A HREF="https://nixos.wiki/" ADD_DATE="0" LAST_MODIFIED="0">wiki</A>
+    <DT><H3>Nix sites</H3>
+      <DL><p>
+        <DT><A HREF="https://nixos.org/" ADD_DATE="0" LAST_MODIFIED="0">homepage</A>
+        <DT><A HREF="https://nixos.wiki/" ADD_DATE="0" LAST_MODIFIED="0">wiki</A>
+      </p></DL>
+    </p></DL>
   </p></DL>
 </p></DL>
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
@@ -43,6 +43,19 @@ lib.mkIf config.test.enableBig {
               name = "wiki";
               url = "https://nixos.wiki/";
             }
+            {
+              name = "Nix sites";
+              bookmarks = [
+                {
+                  name = "homepage";
+                  url = "https://nixos.org/";
+                }
+                {
+                  name = "wiki";
+                  url = "https://nixos.wiki/";
+                }
+              ];
+            }
           ];
         }
       ];