Modules/Firefox: Fix (?) bookmarks structure

home/modules/firefox/bookmarks.nix

@@ -5,8 +5,10 @@ let
   };
 in [
   {
-    name = "NixOS";
     toolbar = true;
+    bookmarks = [
+      {
+        name = "NixOS";
         bookmarks = [
           (bookmark "Package Search" "https://search.nixos.org/packages")
           (bookmark "Option Search" "https://search.nixos.org/options?")
@@ -29,7 +31,6 @@ in [
 
       {
         name = "Lab";
-    toolbar = true;
         bookmarks = [
           (bookmark "LAN Smart Switch" "http://192.168.86.2/")
           (bookmark "WiFi Access Point" "http://192.168.86.3/")
@@ -54,7 +55,6 @@ in [
 
       {
         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")
@@ -82,4 +82,6 @@ in [
       (bookmark "ECR" "https://gallery.ecr.aws/")
       (bookmark "Music" "https://bandcamp.com/chriphost")
       (bookmark "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/")
+    ];
+  }
 ]

home/modules/firefox/default.nix

@@ -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;