diff --git a/modules/nixos/bundles/common/default.nix b/modules/nixos/bundles/common/default.nix index e08a27b..79904ab 100644 --- a/modules/nixos/bundles/common/default.nix +++ b/modules/nixos/bundles/common/default.nix @@ -24,7 +24,7 @@ in { hardware.bootloader = enabled; services = { - ci = { + apps = { slurm = { enable = true; controlHosts = ["arisu" "chibi"]; diff --git a/modules/nixos/services/ci/pm2/default.nix b/modules/nixos/services/apps/pm2/default.nix similarity index 95% rename from modules/nixos/services/ci/pm2/default.nix rename to modules/nixos/services/apps/pm2/default.nix index 0ec0d33..4793932 100644 --- a/modules/nixos/services/ci/pm2/default.nix +++ b/modules/nixos/services/apps/pm2/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkIf mkEnableOption; inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace; - base = "${namespace}.services.ci.pm2"; + base = "${namespace}.services.apps.pm2"; cfg = getAttrByNamespace config base; userCfg = config.users.users; in { diff --git a/modules/nixos/services/ci/slurm/default.nix b/modules/nixos/services/apps/slurm/default.nix similarity index 98% rename from modules/nixos/services/ci/slurm/default.nix rename to modules/nixos/services/apps/slurm/default.nix index aaaecef..dda5a0a 100644 --- a/modules/nixos/services/ci/slurm/default.nix +++ b/modules/nixos/services/apps/slurm/default.nix @@ -8,7 +8,7 @@ inherit (lib) types mkEnableOption mkIf groupBy mapAttrsToList attrNames mapAttrs concatStringsSep flatten; inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace resolveHostIP mkOpt mkOptAttrset mkListOpt; inherit (config.networking) hostName; - base = "${namespace}.services.ci.slurm"; + base = "${namespace}.services.apps.slurm"; cfg = getAttrByNamespace config base; networkCfg = getAttrByNamespace config "${namespace}.services.networking"; in { diff --git a/modules/nixos/services/networking/acme/default.nix b/modules/nixos/services/security/acme/default.nix similarity index 100% rename from modules/nixos/services/networking/acme/default.nix rename to modules/nixos/services/security/acme/default.nix diff --git a/systems/x86_64-linux/arisu-windows/default.nix b/systems/x86_64-linux/arisu-windows/default.nix index 4b90c91..9a2f6ac 100644 --- a/systems/x86_64-linux/arisu-windows/default.nix +++ b/systems/x86_64-linux/arisu-windows/default.nix @@ -20,7 +20,7 @@ in { hardware.bootloader = mkForce disabled; services = { - ci = { + apps = { slurm = { enable = mkForce false; }; diff --git a/systems/x86_64-linux/kokoro-windows/default.nix b/systems/x86_64-linux/kokoro-windows/default.nix index 928baa5..013c345 100644 --- a/systems/x86_64-linux/kokoro-windows/default.nix +++ b/systems/x86_64-linux/kokoro-windows/default.nix @@ -20,7 +20,7 @@ in { hardware.bootloader = mkForce disabled; services = { - ci = { + apps = { slurm = { enable = mkForce false; }; diff --git a/systems/x86_64-linux/mutualofomaha/default.nix b/systems/x86_64-linux/mutualofomaha/default.nix index 912c853..6e4de7f 100644 --- a/systems/x86_64-linux/mutualofomaha/default.nix +++ b/systems/x86_64-linux/mutualofomaha/default.nix @@ -20,7 +20,7 @@ in { hardware.bootloader = mkForce disabled; services = { - ci = { + apps = { slurm = { enable = mkForce false; };