reverted server factory

modules/servers/homepage.nix

@@ -1,14 +1,14 @@
 {
   lib,
   config,
-  inputs,
   ...
 }:
 let
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   cfg = config.my.servers.homepage;
 in
 {
-  options.my.servers.homepage = inputs.self.lib.mkServerOptions "homepage" "home" 8082 lib;
+  options.my.servers.homepage = setup.mkOptions "homepage" "home" 8082;
   config = lib.mkIf config.my.secureHost {
     sops.secrets = lib.mkIf cfg.enable {
       homepage.sopsFile = ../../secrets/homepage.yaml;
@@ -29,7 +29,11 @@ in
       };
       widgets = import ./homepage/widgets.nix;
       services = import ./homepage/services.nix { inherit lib config; };
-      bookmarks = inputs.self.lib.autoImport ./homepage/bookmarks (_: true) |> map import;
+      bookmarks =
+        builtins.readDir ./homepage/bookmarks
+        |> builtins.attrNames
+        |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+        |> map (file: import ./homepage/bookmarks/${file});
     };
   };
 }