From 375631f35bb011031957d8a581e83ebe071bde13 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <rhoriguchi@users.noreply.github.com>
Date: Sat, 27 Aug 2022 03:28:57 +0200
Subject: [PATCH] firefox: support nested folders in bookmarks (#3112)

---
 modules/programs/firefox.nix                        |  2 +-
 .../profile-settings-expected-bookmarks.html        |  6 ++++++
 tests/modules/programs/firefox/profile-settings.nix | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index a5864b81..63adf02b 100644
--- 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
index 2907a66c..3bdcac0f 100644
--- a/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
+++ b/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
@@ -16,5 +16,11 @@
   <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
index fc8f4e71..23bf1285 100644
--- 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/";
+                }
+              ];
+            }
           ];
         }
       ];