refactor: complete overhaul

home-manager/modules/firefox/config/bookmarks/config/flake/selfHosted.nix

@@ -1,7 +1,7 @@
 {flake, ...}: let
   inherit (flake.config.people) user0;
   inherit (flake.config.people.users.${user0}) aliases;
-  inherit (flake.config.machines.devices) nas server;
+  inherit (flake.config.machines.devices) synology server;
   inherit (flake.config.services) instances;
 
   jellyfinTags = ["jelly" "video" "streaming" "movies" "shows" "music"];
@@ -92,7 +92,7 @@ in {
     }
     {
       name = "${instances.syncthing.label} (${instances.synology.label})";
-      url = "http://${nas.ip.address0}:${toString instances.syncthing.ports.port0}";
+      url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}";
       tags =
         ["synology"]
         ++ syncthingTags;
@@ -108,7 +108,7 @@ in {
     }
     {
       name = instances.synology.label;
-      url = "https://${nas.ip.address0}:${toString instances.synology.ports.port0}";
+      url = "https://${synology.ip.address0}:${toString instances.synology.ports.port0}";
       tags = [instances.synology.name "dsm" "cloud"];
       keyword = instances.synology.label;
     }

home-manager/modules/firefox/config/bookmarks/default.nix

@@ -1,28 +1,26 @@
 {flake, ...}: let
-  aggregatedBookmarks =
+  configPath = ./config;
+  flakedPath = configPath + "/flake";
+
+  filterFiles = name: builtins.match ".*\\.nix$" name != null;
+
+  regularBookmarks = let
+    files = builtins.attrNames (builtins.readDir configPath);
+  in
     builtins.foldl' (
-      emptyList: bookmarks:
-        emptyList ++ bookmarks.bookmarks
-    ) [] (map
-      (name: import ./${name}.nix)
-      [
-        "academic"
-        "development"
-        "gaming"
-        "finances"
-        "shopping"
-        "socialMedia"
-        "tools"
-        "tracking"
-      ])
-    ++ builtins.foldl' (
-      emptyList: bookmarks:
-        emptyList ++ bookmarks.bookmarks
-    ) [] (map
-      (name: import ./${name}.nix {inherit flake;})
-      [
-        "selfHosted"
-      ]);
+      emptyList: bookmarkFile:
+        emptyList ++ (import (configPath + "/${bookmarkFile}")).bookmarks
+    ) [] (builtins.filter filterFiles files);
+
+  flakedBookmarks = let
+    files = builtins.attrNames (builtins.readDir flakedPath);
+  in
+    builtins.foldl' (
+      emptyList: bookmarkFile:
+        emptyList ++ (import (flakedPath + "/${bookmarkFile}") {inherit flake;}).bookmarks
+    ) [] (builtins.filter filterFiles files);
+
+  aggregatedBookmarks = regularBookmarks ++ flakedBookmarks;
 in {
   bookmarks = aggregatedBookmarks;
 }