renamed factory scripts

modules/network/nginx.nix

@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  setup = import ../servers/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   proxyReverseServices = [
     "firefox-syncserver"
     "readeck"

modules/scripts/download.nix

@@ -6,7 +6,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   options.my.units = {
     download.enable = lib.mkEnableOption "enable";
     downloadManga.enable = lib.mkEnableOption "enable";

modules/scripts/ffmpeg4discord.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.ffmpeg4discord = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/ffmpreg.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.ffmpreg = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/find-dup-episode.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.find-dup-episodes = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/library-report.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.library-report = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/manage-library.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.manage-library = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/pika-list.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.pika-list = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/run.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.run = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/split-dir.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.split-dir = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/stream-dl.nix

@@ -6,7 +6,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   options.my.units.stream-dl.enable = lib.mkEnableOption "enable";
   config =
     let

modules/scripts/tasks.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.tasks = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/tuh-activity-logger.nix

@@ -1,6 +1,6 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.tuh-activity-logger = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/update-dns.nix

@@ -6,7 +6,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config = lib.mkIf config.my.secureHost {
     sops.secrets = {
       cloudflare-api.sopsFile = ../../secrets/env.yaml;

modules/scripts/update-org-agenda-cache.nix

@@ -5,7 +5,7 @@
   ...
 }:
 {
-  imports = [ ../factories/base.nix ];
+  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.update-org-agenda-cache = {
     enable = lib.mkDefault false;
     install = config.my.emacs.enable;

modules/servers/atticd.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.atticd;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.atticd = setup.mkOptions "atticd" "cache" 2343;

modules/servers/audiobookshelf.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.audiobookshelf;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687;

modules/servers/bazarr.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.bazarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.bazarr = setup.mkOptions "bazarr" "subs" config.services.bazarr.listenPort;

modules/servers/drpp.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.drpp;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.drpp = setup.mkOptions "drpp" "drpp" 0;

modules/servers/firefox-syncserver.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.firefox-syncserver;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.firefox-syncserver = setup.mkOptions "firefox-syncserver" "sync" 4233;

modules/servers/flame.nix

@@ -3,7 +3,7 @@ let
   cfg = config.my.servers.flame;
   cfgS = config.my.servers.flameSecret;
   enable = (cfg.enable || cfgS.enable) && config.my.secureHost;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers = {

modules/servers/gitea.nix

@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.gitea;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   imports = [

modules/servers/homepage.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.homepage;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.homepage = setup.mkOptions "homepage" "home" 8082;

modules/servers/jellyfin.nix

@@ -19,7 +19,7 @@ let
     pkgs.gum
     sub-sync
   ];
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;

modules/servers/kavita.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.kavita;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.kavita = setup.mkOptions "kavita" "library" config.services.kavita.settings.Port;

modules/servers/lidarr.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.lidarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.lidarr = setup.mkOptions "lidarr" "music" 8686;

modules/servers/maloja.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.maloja;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.maloja = setup.mkOptions "maloja" "maloja" 42010;

modules/servers/mealie.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.mealie;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.mealie = setup.mkOptions "mealie" "mealie" 9925;

modules/servers/metube.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.metube;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.metube = setup.mkOptions "metube" "bajameesta" 8881;

modules/servers/microbin.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.microbin;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.microbin = setup.mkOptions "microbin" "copy" 8086;

modules/servers/multi-scrobbler.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.multi-scrobbler;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.multi-scrobbler = setup.mkOptions "multi-scrobbler" "scrobble" 9078;

modules/servers/nextcloud.nix

@@ -31,7 +31,7 @@ let
   pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]);
   cfg = config.my.servers.nextcloud;
   cfgC = config.my.servers.collabora;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers = {

modules/servers/nix-serve.nix

@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.nix-serve;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.nix-serve = setup.mkOptions "nix-serve" "cache" 5000;

modules/servers/ombi.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.ombi;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.ombi = setup.mkOptions "ombi" "requests" 3425;

modules/servers/plex-discord-bot.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.plex-discord-bot;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   name = "plex-discord-bot";
 in
 {

modules/servers/plex.nix

@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.servers.plex;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.plex = setup.mkOptions "plex" "plex" 32400;

modules/servers/portfolio.nix

@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.websites.portfolio;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.websites.portfolio = setup.mkOptions "portfolio" "portfolio" 0;

modules/servers/prowlarr.nix

@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.servers.prowlarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.prowlarr = setup.mkOptions "prowlarr" "indexer" 9696;

modules/servers/radarr.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.radarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.radarr = setup.mkOptions "radarr" "movies" 7878;

modules/servers/readeck.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.readeck;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.readeck = setup.mkOptions "readeck" "laters" 9546;

modules/servers/ryot.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.ryot;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.ryot = setup.mkOptions "ryot" "tracker" 8765;

modules/servers/shiori.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.shiori;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;

modules/servers/sonarr.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.sonarr;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.sonarr = setup.mkOptions "sonarr" "series" 8989;

modules/servers/stash.nix

@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.stash;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.stash = setup.mkOptions "stash" "xxx" 9999;

modules/servers/synapse.nix

@@ -8,7 +8,7 @@ let
   cfg = config.my.servers.synapse;
   cfgE = config.my.servers.element;
   domain = "wedsgk5ac2qcaf9yb.click";
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   clientConfig."m.homeserver".base_url = cfg.url;
   serverConfig."m.server" = "${cfg.host}:443";
   mkWellKnown = data: ''

modules/servers/tranga.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 let
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   cfg = config.my.servers.tranga;
 in
 {

modules/servers/vaultwarden.nix

@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.vaultwarden;
-  setup = import ../factories/setup.nix { inherit lib config; };
+  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.vaultwarden = setup.mkOptions "vaultwarden" "vault" 8222;