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

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

@@ -1,31 +1,46 @@
 {flake, ...}: let
-  aggregatedSearchEngines =
+  configPath = ./config;
+  flakedPath = configPath + "/flake";
+
+  regularSearchEngines = let
+    files = builtins.attrNames (builtins.readDir configPath);
+  in
     builtins.foldl' (
       emptySet: searchEngine:
-        emptySet // (import ./${searchEngine}.nix)
-    ) {} [
-      "academic"
-      "development"
-      "gaming"
-      "hidden"
-      "shopping"
-      "socialMedia"
-      "spank"
-      "tools"
-      "tracking"
-      "web"
-    ]
-    // builtins.foldl' (
+        emptySet // (import (configPath + "/${searchEngine}"))
+    ) {} (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
+
+  flakedSearchEngines = let
+    files = builtins.attrNames (builtins.readDir flakedPath);
+  in
+    builtins.foldl' (
       emptySet: searchEngine:
-        emptySet // (import ./${searchEngine}.nix {inherit flake;})
-    ) {} [
-      "selfHosted"
-    ];
+        emptySet // (import (flakedPath + "/${searchEngine}") {inherit flake;})
+    ) {} (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
+
+  aggregatedSearchEngines = regularSearchEngines // flakedSearchEngines;
 in {
   search = {
     force = true;
     default = "Kagi";
     engines = aggregatedSearchEngines;
-    order = import ./order.nix;
+    order = [
+      "AlternativeTo"
+      "Core Radio"
+      "Hackage"
+      "Hoogle"
+      "Jellyfin"
+      "Kagi"
+      "Nix Home Manager"
+      "Nix Options"
+      "Nix Packages"
+      "Nix Wiki"
+      "PeerTube"
+      "Sci-Hub"
+      "Torrent Leech"
+      "Urban Dictionary"
+      "Wikipedia"
+      "YouTube"
+    ];
   };
 }

home-manager/modules/firefox/config/search/order.nix

@@ -1,36 +0,0 @@
-[
-  # "1337x"
-  "AlternativeTo"
-  # "Amazon"
-  # "Brave"
-  "Core Radio"
-  # "DNS Checker"
-  # "Door Dash"
-  # "FYT Supplies"
-  "Hackage"
-  "Hoogle"
-  "Jellyfin"
-  "Kagi"
-  # "Kijiji"
-  # "Memory Express"
-  "Nix Home Manager"
-  "Nix Options"
-  "Nix Packages"
-  "Nix Wiki"
-  "PeerTube"
-  # "Proton DB"
-  # "Reddit"
-  # "Rhyme Zone"
-  "Sci-Hub"
-  # "Skip The Dishes"
-  # "Stanford Encyclopedia of Philosophy"
-  # "Steam DB"
-  # "The Pirate Bay"
-  "Torrent Leech"
-  "Urban Dictionary"
-  # "VSTorrent"
-  "Wikipedia"
-  # "X"
-  # "XVideos"
-  "YouTube"
-]

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

@@ -1,26 +1,14 @@
 let
-  aggregatedSettings =
+  configPath = ./config;
+
+  aggregatedSettings = let
+    files = builtins.attrNames (builtins.readDir configPath);
+  in
     builtins.foldl' (
-      emptySet: settingsFiles:
-        emptySet // (import ./${settingsFiles}.nix)
-    ) {} [
-      "cosmetics"
-      "diskAvoidance"
-      "fingerprinting"
-      "formFill"
-      "geolocation"
-      "hardening"
-      "https"
-      "misc"
-      "noTouching"
-      "opSec"
-      "outbound"
-      "passwords"
-      "privacy"
-      "proxy"
-      "startup"
-      "telemetry"
-    ];
+      emptySet: settingsFile:
+        emptySet // (import (configPath + "/${settingsFile}"))
+    ) {}
+    (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
 in {
   settings = aggregatedSettings;
 }

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

@@ -1,3 +1,3 @@
 {
-  userChrome = builtins.readFile ./userChrome.css;
+  userChrome = builtins.readFile ./config/userChrome.css;
 }