flake parts, migrated modules

modules/servers/shiori.nix

@@ -1,10 +1,14 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
 let
   cfg = config.my.servers.shiori;
-  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
-  options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
+  options.my.servers.shiori = inputs.self.lib.mkServerOptions "shiori" "bookmarks" 4368 lib;
   config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
     sops.secrets.shiori.sopsFile = ../../secrets/env.yaml;
     services.shiori = {