Modules/Firefox: Fix (?) bookmarks structure

home/modules/firefox/bookmarks.nix

@@ -5,8 +5,12 @@ let
   };
 in [
   {
-    name = "NixOS";
     toolbar = true;
+    bookmarks = [
+      # NixOS
+
+      {
+        name = "NixOS";
         bookmarks = [
           (bookmark "Package Search" "https://search.nixos.org/packages")
           (bookmark "Option Search" "https://search.nixos.org/options?")
@@ -24,12 +28,12 @@ in [
       }
       (bookmark "Searchix" "https://searchix.ovh/")
       (bookmark "Latest" "https://discourse.nixos.org/latest")
-
       "separator"
 
+      # HomeLab
+
       {
         name = "Lab";
-    toolbar = true;
         bookmarks = [
           (bookmark "LAN Smart Switch" "http://192.168.86.2/")
           (bookmark "WiFi Access Point" "http://192.168.86.3/")
@@ -48,13 +52,13 @@ in [
       (bookmark "HASS" "https://hass.think.chriphost.de/lovelace")
       (bookmark "Docs" "https://paperless.local.chriphost.de/documents?sort=created&reverse=1&page=1")
       (bookmark "Gitea" "https://gitea.local.chriphost.de/christoph")
-  (bookmark "AI" "http://localhost:11435/")
+      (bookmark "Chat" "http://localhost:11435/")
-
       "separator"
 
+      # Coding
+
       {
         name = "Coding";
-    toolbar = true;
         bookmarks = [
           (bookmark "C++Ref" "https://en.cppreference.com/w/")
           (bookmark "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
@@ -65,21 +69,24 @@ in [
       (bookmark "GH" "https://github.com/churl")
       (bookmark "GL" "https://gitlab.com/churl")
       (bookmark "SO" "https://stackoverflow.com/users/saves/17337508/all")
-  (bookmark "HN" "https://news.ycombinator.com/news")
-  (bookmark "Heise" "https://www.heise.de/")
-  (bookmark "Spiegel" "https://www.spiegel.de/")
-  (bookmark "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/")
-
-  "separator"
-
-  (bookmark "F10" "https://f10.local.chriphost.de/race/Everyone")
-  (bookmark "F11" "https://f11.local.chriphost.de/racepicks")
-  (bookmark "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid")
       (bookmark "RegEx" "https://regex101.com/")
       (bookmark "Shell" "https://explainshell.com/")
       (bookmark "CDecl" "https://cdecl.org/")
-  (bookmark "ISBNDB" "https://isbndb.com/")
       (bookmark "ECR" "https://gallery.ecr.aws/")
+      "separator"
+
+      # Stuff
+
+      (bookmark "Spiegel" "https://www.spiegel.de/")
+      (bookmark "Heise" "https://www.heise.de/")
+      (bookmark "HN" "https://news.ycombinator.com/news")
+      (bookmark "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/")
+      (bookmark "F10" "https://f10.local.chriphost.de/race/Everyone")
+      (bookmark "F11" "https://f11.local.chriphost.de/racepicks")
+      (bookmark "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid")
+      (bookmark "ISBNDB" "https://isbndb.com/")
       (bookmark "Music" "https://bandcamp.com/chriphost")
       (bookmark "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/")
+    ];
+  }
 ]

home/modules/firefox/default.nix

@@ -73,7 +73,7 @@ in {
             WebSuggestions = false;
           };
           HardwareAcceleration = true;
-          NoDefaultBookmarks = true;
+          # NoDefaultBookmarks = true; # Prevents HM from applying bookmarks
           OfferToSaveLogins = false;
           PictureInPicture = true;
           SanitizeOnShutdown = {
@@ -230,12 +230,13 @@ in {
           };
 
           settings = lib.mkMerge [
-            (builtins.readFile ./settings.nix)
+            (import ./settings.nix)
 
             {
               # NOTE: This has to be updated when something is changed inside firefox...
               "browser.uiCustomization.state" = builtins.readFile ./customizationState.json;
               "toolkit.legacyUserProfileCustomizations.stylesheets" = firefox.disableTabBar;
+              "identity.fxaccounts.account.device.name" = hostname;
             }
 
             (lib.optionalAttrs firefox.vaapi {

home/modules/firefox/settings.nix

@@ -75,8 +75,6 @@
   "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
   "geo.provider.use_gpsd" = false;
 
-  "identity.fxaccounts.account.device.name" = hostname;
-
   "media.hardwaremediakeys.enabled" = false; # Do not interfere with spotify
   "media.videocontrols.picture-in-picture.video-toggle.enabled" = true;