diff --git a/hive.nix b/hive.nix index 2316de7..d9378c6 100644 --- a/hive.nix +++ b/hive.nix @@ -14,10 +14,7 @@ let nodes = builtins.attrNames nodes'; mkNode = node: { - # Import the base configuration for each node - imports = [ ./machines/${node}/_configuration.nix ]; - - deployment.systemType = "nixos"; + deployment.systemType = system node; }; nixpkgs' = import ./meta/nixpkgs.nix; @@ -28,6 +25,7 @@ let # defaulting to the one defined in meta/nixpkgs version = node: nodes'.${node}.nixpkgs.version; system = node: nodes'.${node}.nixpkgs.system; + category = node: nixpkgs'.categories.${system node}; nodePkgs = node: nixpkgs.${system node}.${version node}; @@ -77,6 +75,7 @@ let meta = (import ./meta) lib; nodeMeta = meta.nodes.${node}; + nodePath = "machines/${category node}/${node}"; }; in @@ -97,23 +96,32 @@ in nixos = { evalConfig = args: import "${args.specialArgs.sourcePkgs.path}/nixos/lib/eval-config.nix" args; defaults = - { name, nodeMeta, ... }: + { + name, + nodeMeta, + nodePath, + sourcePkgs, + ... + }: { # Import the default modules imports = [ - ./modules + # Import the base configuration for each node + ./${nodePath}/_configuration.nix + ./modules/generic (import "${sources.lix-module}/module.nix" { inherit (sources) lix; }) + ./modules/${category name} ]; # Include default secrets - age-secrets.sources = [ ./machines/${name}/secrets ]; + age-secrets.sources = [ ./${nodePath}/secrets ]; # Deployment config is specified in meta.nodes.${node}.deployment inherit (nodeMeta) deployment; nix = { # Set NIX_PATH to the patched version of nixpkgs - nixPath = [ "nixpkgs=${mkNixpkgs' (version name)}" ]; + nixPath = [ "nixpkgs=${sourcePkgs.path}" ]; optimise.automatic = true; gc = { diff --git a/machines/bridge01/secrets/secrets.nix b/machines/bridge01/secrets/secrets.nix deleted file mode 100644 index 905f411..0000000 --- a/machines/bridge01/secrets/secrets.nix +++ /dev/null @@ -1,3 +0,0 @@ -(import ../../../keys).mkSecrets [ "bridg01" ] [ - # List of secrets for bridge01 -] diff --git a/machines/geo01/secrets/secrets.nix b/machines/geo01/secrets/secrets.nix deleted file mode 100644 index 39d4f29..0000000 --- a/machines/geo01/secrets/secrets.nix +++ /dev/null @@ -1,3 +0,0 @@ -(import ../../../keys).mkSecrets [ "geo01" ] [ - # List of secrets for geo01 -] diff --git a/machines/geo02/secrets/secrets.nix b/machines/geo02/secrets/secrets.nix deleted file mode 100644 index 429d1a7..0000000 --- a/machines/geo02/secrets/secrets.nix +++ /dev/null @@ -1,3 +0,0 @@ -(import ../../../keys).mkSecrets [ "geo02" ] [ - # List of secrets for geo02 -] diff --git a/machines/bridge01/_configuration.nix b/machines/nixos/bridge01/_configuration.nix similarity index 100% rename from machines/bridge01/_configuration.nix rename to machines/nixos/bridge01/_configuration.nix diff --git a/machines/bridge01/_hardware-configuration.nix b/machines/nixos/bridge01/_hardware-configuration.nix similarity index 100% rename from machines/bridge01/_hardware-configuration.nix rename to machines/nixos/bridge01/_hardware-configuration.nix diff --git a/machines/bridge01/network.nix b/machines/nixos/bridge01/network.nix similarity index 100% rename from machines/bridge01/network.nix rename to machines/nixos/bridge01/network.nix diff --git a/machines/nixos/bridge01/secrets/secrets.nix b/machines/nixos/bridge01/secrets/secrets.nix new file mode 100644 index 0000000..bb14883 --- /dev/null +++ b/machines/nixos/bridge01/secrets/secrets.nix @@ -0,0 +1,3 @@ +(import ../../../../keys).mkSecrets [ "bridg01" ] [ + # List of secrets for bridge01 +] diff --git a/machines/compute01/_configuration.nix b/machines/nixos/compute01/_configuration.nix similarity index 100% rename from machines/compute01/_configuration.nix rename to machines/nixos/compute01/_configuration.nix diff --git a/machines/compute01/_hardware-configuration.nix b/machines/nixos/compute01/_hardware-configuration.nix similarity index 100% rename from machines/compute01/_hardware-configuration.nix rename to machines/nixos/compute01/_hardware-configuration.nix diff --git a/machines/compute01/arkheon.nix b/machines/nixos/compute01/arkheon.nix similarity index 100% rename from machines/compute01/arkheon.nix rename to machines/nixos/compute01/arkheon.nix diff --git a/machines/compute01/dgsi/default.nix b/machines/nixos/compute01/dgsi/default.nix similarity index 100% rename from machines/compute01/dgsi/default.nix rename to machines/nixos/compute01/dgsi/default.nix diff --git a/machines/compute01/ds-fr/default.nix b/machines/nixos/compute01/ds-fr/default.nix similarity index 100% rename from machines/compute01/ds-fr/default.nix rename to machines/nixos/compute01/ds-fr/default.nix diff --git a/machines/compute01/ds-fr/module.nix b/machines/nixos/compute01/ds-fr/module.nix similarity index 100% rename from machines/compute01/ds-fr/module.nix rename to machines/nixos/compute01/ds-fr/module.nix diff --git a/machines/compute01/grafana.nix b/machines/nixos/compute01/grafana.nix similarity index 100% rename from machines/compute01/grafana.nix rename to machines/nixos/compute01/grafana.nix diff --git a/machines/compute01/hedgedoc.nix b/machines/nixos/compute01/hedgedoc.nix similarity index 100% rename from machines/compute01/hedgedoc.nix rename to machines/nixos/compute01/hedgedoc.nix diff --git a/machines/compute01/kanidm/default.nix b/machines/nixos/compute01/kanidm/default.nix similarity index 100% rename from machines/compute01/kanidm/default.nix rename to machines/nixos/compute01/kanidm/default.nix diff --git a/machines/compute01/kanidm/secrets/kanidm-password_admin b/machines/nixos/compute01/kanidm/secrets/kanidm-password_admin similarity index 100% rename from machines/compute01/kanidm/secrets/kanidm-password_admin rename to machines/nixos/compute01/kanidm/secrets/kanidm-password_admin diff --git a/machines/compute01/kanidm/secrets/secrets.nix b/machines/nixos/compute01/kanidm/secrets/secrets.nix similarity index 50% rename from machines/compute01/kanidm/secrets/secrets.nix rename to machines/nixos/compute01/kanidm/secrets/secrets.nix index ef60ece..6d8616c 100644 --- a/machines/compute01/kanidm/secrets/secrets.nix +++ b/machines/nixos/compute01/kanidm/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../../keys).mkSecrets [ "compute01" ] [ +(import ../../../../../keys).mkSecrets [ "compute01" ] [ "kanidm-password_admin" "kanidm-password_idm_admin" ] diff --git a/machines/compute01/librenms/default.nix b/machines/nixos/compute01/librenms/default.nix similarity index 100% rename from machines/compute01/librenms/default.nix rename to machines/nixos/compute01/librenms/default.nix diff --git a/machines/compute01/librenms/kanidm.patch b/machines/nixos/compute01/librenms/kanidm.patch similarity index 100% rename from machines/compute01/librenms/kanidm.patch rename to machines/nixos/compute01/librenms/kanidm.patch diff --git a/machines/compute01/librenms/module.nix b/machines/nixos/compute01/librenms/module.nix similarity index 100% rename from machines/compute01/librenms/module.nix rename to machines/nixos/compute01/librenms/module.nix diff --git a/machines/compute01/mastodon.nix b/machines/nixos/compute01/mastodon.nix similarity index 100% rename from machines/compute01/mastodon.nix rename to machines/nixos/compute01/mastodon.nix diff --git a/machines/compute01/nextcloud.nix b/machines/nixos/compute01/nextcloud.nix similarity index 100% rename from machines/compute01/nextcloud.nix rename to machines/nixos/compute01/nextcloud.nix diff --git a/machines/compute01/ollama-proxy.nix b/machines/nixos/compute01/ollama-proxy.nix similarity index 100% rename from machines/compute01/ollama-proxy.nix rename to machines/nixos/compute01/ollama-proxy.nix diff --git a/machines/compute01/outline.nix b/machines/nixos/compute01/outline.nix similarity index 100% rename from machines/compute01/outline.nix rename to machines/nixos/compute01/outline.nix diff --git a/machines/compute01/plausible.nix b/machines/nixos/compute01/plausible.nix similarity index 100% rename from machines/compute01/plausible.nix rename to machines/nixos/compute01/plausible.nix diff --git a/machines/compute01/postgresql.nix b/machines/nixos/compute01/postgresql.nix similarity index 100% rename from machines/compute01/postgresql.nix rename to machines/nixos/compute01/postgresql.nix diff --git a/machines/compute01/rstudio-server.nix b/machines/nixos/compute01/rstudio-server.nix similarity index 100% rename from machines/compute01/rstudio-server.nix rename to machines/nixos/compute01/rstudio-server.nix diff --git a/machines/compute01/satosa/default.nix b/machines/nixos/compute01/satosa/default.nix similarity index 100% rename from machines/compute01/satosa/default.nix rename to machines/nixos/compute01/satosa/default.nix diff --git a/machines/compute01/satosa/module.nix b/machines/nixos/compute01/satosa/module.nix similarity index 100% rename from machines/compute01/satosa/module.nix rename to machines/nixos/compute01/satosa/module.nix diff --git a/machines/compute01/satosa/package/cookies-samesite-compat.nix b/machines/nixos/compute01/satosa/package/cookies-samesite-compat.nix similarity index 100% rename from machines/compute01/satosa/package/cookies-samesite-compat.nix rename to machines/nixos/compute01/satosa/package/cookies-samesite-compat.nix diff --git a/machines/compute01/satosa/package/default.nix b/machines/nixos/compute01/satosa/package/default.nix similarity index 100% rename from machines/compute01/satosa/package/default.nix rename to machines/nixos/compute01/satosa/package/default.nix diff --git a/machines/compute01/satosa/package/oic.nix b/machines/nixos/compute01/satosa/package/oic.nix similarity index 100% rename from machines/compute01/satosa/package/oic.nix rename to machines/nixos/compute01/satosa/package/oic.nix diff --git a/machines/compute01/satosa/package/pydantic-core.nix b/machines/nixos/compute01/satosa/package/pydantic-core.nix similarity index 100% rename from machines/compute01/satosa/package/pydantic-core.nix rename to machines/nixos/compute01/satosa/package/pydantic-core.nix diff --git a/machines/compute01/satosa/package/pydantic-settings.nix b/machines/nixos/compute01/satosa/package/pydantic-settings.nix similarity index 100% rename from machines/compute01/satosa/package/pydantic-settings.nix rename to machines/nixos/compute01/satosa/package/pydantic-settings.nix diff --git a/machines/compute01/satosa/package/pydantic.nix b/machines/nixos/compute01/satosa/package/pydantic.nix similarity index 100% rename from machines/compute01/satosa/package/pydantic.nix rename to machines/nixos/compute01/satosa/package/pydantic.nix diff --git a/machines/compute01/satosa/package/pyop.nix b/machines/nixos/compute01/satosa/package/pyop.nix similarity index 100% rename from machines/compute01/satosa/package/pyop.nix rename to machines/nixos/compute01/satosa/package/pyop.nix diff --git a/machines/compute01/satosa/package/satosa.nix b/machines/nixos/compute01/satosa/package/satosa.nix similarity index 100% rename from machines/compute01/satosa/package/satosa.nix rename to machines/nixos/compute01/satosa/package/satosa.nix diff --git a/machines/compute01/secrets/arkheon-env_file b/machines/nixos/compute01/secrets/arkheon-env_file similarity index 100% rename from machines/compute01/secrets/arkheon-env_file rename to machines/nixos/compute01/secrets/arkheon-env_file diff --git a/machines/compute01/secrets/bupstash-put_key b/machines/nixos/compute01/secrets/bupstash-put_key similarity index 100% rename from machines/compute01/secrets/bupstash-put_key rename to machines/nixos/compute01/secrets/bupstash-put_key diff --git a/machines/compute01/secrets/dgsi-email_host_password_file b/machines/nixos/compute01/secrets/dgsi-email_host_password_file similarity index 100% rename from machines/compute01/secrets/dgsi-email_host_password_file rename to machines/nixos/compute01/secrets/dgsi-email_host_password_file diff --git a/machines/compute01/secrets/dgsi-kanidm_auth_token_file b/machines/nixos/compute01/secrets/dgsi-kanidm_auth_token_file similarity index 100% rename from machines/compute01/secrets/dgsi-kanidm_auth_token_file rename to machines/nixos/compute01/secrets/dgsi-kanidm_auth_token_file diff --git a/machines/compute01/secrets/dgsi-kanidm_secret_file b/machines/nixos/compute01/secrets/dgsi-kanidm_secret_file similarity index 100% rename from machines/compute01/secrets/dgsi-kanidm_secret_file rename to machines/nixos/compute01/secrets/dgsi-kanidm_secret_file diff --git a/machines/compute01/secrets/dgsi-secret_key_file b/machines/nixos/compute01/secrets/dgsi-secret_key_file similarity index 100% rename from machines/compute01/secrets/dgsi-secret_key_file rename to machines/nixos/compute01/secrets/dgsi-secret_key_file diff --git a/machines/compute01/secrets/dgsi-x509_cert_file b/machines/nixos/compute01/secrets/dgsi-x509_cert_file similarity index 100% rename from machines/compute01/secrets/dgsi-x509_cert_file rename to machines/nixos/compute01/secrets/dgsi-x509_cert_file diff --git a/machines/compute01/secrets/dgsi-x509_key_file b/machines/nixos/compute01/secrets/dgsi-x509_key_file similarity index 100% rename from machines/compute01/secrets/dgsi-x509_key_file rename to machines/nixos/compute01/secrets/dgsi-x509_key_file diff --git a/machines/compute01/secrets/ds-fr-secret_file b/machines/nixos/compute01/secrets/ds-fr-secret_file similarity index 100% rename from machines/compute01/secrets/ds-fr-secret_file rename to machines/nixos/compute01/secrets/ds-fr-secret_file diff --git a/machines/compute01/secrets/grafana-oauth_client_secret_file b/machines/nixos/compute01/secrets/grafana-oauth_client_secret_file similarity index 100% rename from machines/compute01/secrets/grafana-oauth_client_secret_file rename to machines/nixos/compute01/secrets/grafana-oauth_client_secret_file diff --git a/machines/compute01/secrets/grafana-smtp_password_file b/machines/nixos/compute01/secrets/grafana-smtp_password_file similarity index 100% rename from machines/compute01/secrets/grafana-smtp_password_file rename to machines/nixos/compute01/secrets/grafana-smtp_password_file diff --git a/machines/compute01/secrets/hedgedoc-environment_file b/machines/nixos/compute01/secrets/hedgedoc-environment_file similarity index 100% rename from machines/compute01/secrets/hedgedoc-environment_file rename to machines/nixos/compute01/secrets/hedgedoc-environment_file diff --git a/machines/compute01/secrets/librenms-database_password_file b/machines/nixos/compute01/secrets/librenms-database_password_file similarity index 100% rename from machines/compute01/secrets/librenms-database_password_file rename to machines/nixos/compute01/secrets/librenms-database_password_file diff --git a/machines/compute01/secrets/librenms-environment_file b/machines/nixos/compute01/secrets/librenms-environment_file similarity index 100% rename from machines/compute01/secrets/librenms-environment_file rename to machines/nixos/compute01/secrets/librenms-environment_file diff --git a/machines/compute01/secrets/mastodon-extra_env_file b/machines/nixos/compute01/secrets/mastodon-extra_env_file similarity index 100% rename from machines/compute01/secrets/mastodon-extra_env_file rename to machines/nixos/compute01/secrets/mastodon-extra_env_file diff --git a/machines/compute01/secrets/mastodon-smtp-password b/machines/nixos/compute01/secrets/mastodon-smtp-password similarity index 100% rename from machines/compute01/secrets/mastodon-smtp-password rename to machines/nixos/compute01/secrets/mastodon-smtp-password diff --git a/machines/compute01/secrets/nextcloud-adminpass_file b/machines/nixos/compute01/secrets/nextcloud-adminpass_file similarity index 100% rename from machines/compute01/secrets/nextcloud-adminpass_file rename to machines/nixos/compute01/secrets/nextcloud-adminpass_file diff --git a/machines/compute01/secrets/nextcloud-s3_secret_file b/machines/nixos/compute01/secrets/nextcloud-s3_secret_file similarity index 100% rename from machines/compute01/secrets/nextcloud-s3_secret_file rename to machines/nixos/compute01/secrets/nextcloud-s3_secret_file diff --git a/machines/compute01/secrets/outline-oidc_client_secret_file b/machines/nixos/compute01/secrets/outline-oidc_client_secret_file similarity index 100% rename from machines/compute01/secrets/outline-oidc_client_secret_file rename to machines/nixos/compute01/secrets/outline-oidc_client_secret_file diff --git a/machines/compute01/secrets/outline-smtp_password_file b/machines/nixos/compute01/secrets/outline-smtp_password_file similarity index 100% rename from machines/compute01/secrets/outline-smtp_password_file rename to machines/nixos/compute01/secrets/outline-smtp_password_file diff --git a/machines/compute01/secrets/outline-storage_secret_key_file b/machines/nixos/compute01/secrets/outline-storage_secret_key_file similarity index 100% rename from machines/compute01/secrets/outline-storage_secret_key_file rename to machines/nixos/compute01/secrets/outline-storage_secret_key_file diff --git a/machines/compute01/secrets/plausible-admin_user_password_file b/machines/nixos/compute01/secrets/plausible-admin_user_password_file similarity index 100% rename from machines/compute01/secrets/plausible-admin_user_password_file rename to machines/nixos/compute01/secrets/plausible-admin_user_password_file diff --git a/machines/compute01/secrets/plausible-secret_key_base_file b/machines/nixos/compute01/secrets/plausible-secret_key_base_file similarity index 100% rename from machines/compute01/secrets/plausible-secret_key_base_file rename to machines/nixos/compute01/secrets/plausible-secret_key_base_file diff --git a/machines/compute01/secrets/plausible-smtp_password_file b/machines/nixos/compute01/secrets/plausible-smtp_password_file similarity index 100% rename from machines/compute01/secrets/plausible-smtp_password_file rename to machines/nixos/compute01/secrets/plausible-smtp_password_file diff --git a/machines/compute01/secrets/satosa-env_file b/machines/nixos/compute01/secrets/satosa-env_file similarity index 100% rename from machines/compute01/secrets/satosa-env_file rename to machines/nixos/compute01/secrets/satosa-env_file diff --git a/machines/compute01/secrets/secrets.nix b/machines/nixos/compute01/secrets/secrets.nix similarity index 94% rename from machines/compute01/secrets/secrets.nix rename to machines/nixos/compute01/secrets/secrets.nix index 9af2cdd..be4a3bc 100644 --- a/machines/compute01/secrets/secrets.nix +++ b/machines/nixos/compute01/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "compute01" ] [ +(import ../../../../keys).mkSecrets [ "compute01" ] [ # List of secrets for compute01 "arkheon-env_file" "bupstash-put_key" diff --git a/machines/compute01/secrets/signal-irc-bridge-config b/machines/nixos/compute01/secrets/signal-irc-bridge-config similarity index 100% rename from machines/compute01/secrets/signal-irc-bridge-config rename to machines/nixos/compute01/secrets/signal-irc-bridge-config diff --git a/machines/compute01/secrets/telegraf-environment_file b/machines/nixos/compute01/secrets/telegraf-environment_file similarity index 100% rename from machines/compute01/secrets/telegraf-environment_file rename to machines/nixos/compute01/secrets/telegraf-environment_file diff --git a/machines/compute01/secrets/vaultwarden-environment_file b/machines/nixos/compute01/secrets/vaultwarden-environment_file similarity index 100% rename from machines/compute01/secrets/vaultwarden-environment_file rename to machines/nixos/compute01/secrets/vaultwarden-environment_file diff --git a/machines/compute01/secrets/zammad-secret_key_base_file b/machines/nixos/compute01/secrets/zammad-secret_key_base_file similarity index 100% rename from machines/compute01/secrets/zammad-secret_key_base_file rename to machines/nixos/compute01/secrets/zammad-secret_key_base_file diff --git a/machines/compute01/signal-irc-bridge.nix b/machines/nixos/compute01/signal-irc-bridge.nix similarity index 100% rename from machines/compute01/signal-irc-bridge.nix rename to machines/nixos/compute01/signal-irc-bridge.nix diff --git a/machines/compute01/signald.nix b/machines/nixos/compute01/signald.nix similarity index 100% rename from machines/compute01/signald.nix rename to machines/nixos/compute01/signald.nix diff --git a/machines/compute01/stirling-pdf/01-spotless.patch b/machines/nixos/compute01/stirling-pdf/01-spotless.patch similarity index 100% rename from machines/compute01/stirling-pdf/01-spotless.patch rename to machines/nixos/compute01/stirling-pdf/01-spotless.patch diff --git a/machines/compute01/stirling-pdf/02-propsfile.patch b/machines/nixos/compute01/stirling-pdf/02-propsfile.patch similarity index 100% rename from machines/compute01/stirling-pdf/02-propsfile.patch rename to machines/nixos/compute01/stirling-pdf/02-propsfile.patch diff --git a/machines/compute01/stirling-pdf/03-jar-timestamps.patch b/machines/nixos/compute01/stirling-pdf/03-jar-timestamps.patch similarity index 100% rename from machines/compute01/stirling-pdf/03-jar-timestamps.patch rename to machines/nixos/compute01/stirling-pdf/03-jar-timestamps.patch diff --git a/machines/compute01/stirling-pdf/04-local-maven-deps.patch b/machines/nixos/compute01/stirling-pdf/04-local-maven-deps.patch similarity index 100% rename from machines/compute01/stirling-pdf/04-local-maven-deps.patch rename to machines/nixos/compute01/stirling-pdf/04-local-maven-deps.patch diff --git a/machines/compute01/stirling-pdf/05-java-output-test.patch b/machines/nixos/compute01/stirling-pdf/05-java-output-test.patch similarity index 100% rename from machines/compute01/stirling-pdf/05-java-output-test.patch rename to machines/nixos/compute01/stirling-pdf/05-java-output-test.patch diff --git a/machines/compute01/stirling-pdf/default.nix b/machines/nixos/compute01/stirling-pdf/default.nix similarity index 100% rename from machines/compute01/stirling-pdf/default.nix rename to machines/nixos/compute01/stirling-pdf/default.nix diff --git a/machines/compute01/takumi.nix b/machines/nixos/compute01/takumi.nix similarity index 100% rename from machines/compute01/takumi.nix rename to machines/nixos/compute01/takumi.nix diff --git a/machines/compute01/telegraf.nix b/machines/nixos/compute01/telegraf.nix similarity index 100% rename from machines/compute01/telegraf.nix rename to machines/nixos/compute01/telegraf.nix diff --git a/machines/compute01/vaultwarden.nix b/machines/nixos/compute01/vaultwarden.nix similarity index 100% rename from machines/compute01/vaultwarden.nix rename to machines/nixos/compute01/vaultwarden.nix diff --git a/machines/compute01/zammad.nix b/machines/nixos/compute01/zammad.nix similarity index 100% rename from machines/compute01/zammad.nix rename to machines/nixos/compute01/zammad.nix diff --git a/machines/geo01/_configuration.nix b/machines/nixos/geo01/_configuration.nix similarity index 100% rename from machines/geo01/_configuration.nix rename to machines/nixos/geo01/_configuration.nix diff --git a/machines/geo01/_hardware-configuration.nix b/machines/nixos/geo01/_hardware-configuration.nix similarity index 100% rename from machines/geo01/_hardware-configuration.nix rename to machines/nixos/geo01/_hardware-configuration.nix diff --git a/machines/nixos/geo01/secrets/secrets.nix b/machines/nixos/geo01/secrets/secrets.nix new file mode 100644 index 0000000..35310ad --- /dev/null +++ b/machines/nixos/geo01/secrets/secrets.nix @@ -0,0 +1,3 @@ +(import ../../../../keys).mkSecrets [ "geo01" ] [ + # List of secrets for geo01 +] diff --git a/machines/geo02/_configuration.nix b/machines/nixos/geo02/_configuration.nix similarity index 100% rename from machines/geo02/_configuration.nix rename to machines/nixos/geo02/_configuration.nix diff --git a/machines/geo02/_hardware-configuration.nix b/machines/nixos/geo02/_hardware-configuration.nix similarity index 100% rename from machines/geo02/_hardware-configuration.nix rename to machines/nixos/geo02/_hardware-configuration.nix diff --git a/machines/nixos/geo02/secrets/secrets.nix b/machines/nixos/geo02/secrets/secrets.nix new file mode 100644 index 0000000..16de965 --- /dev/null +++ b/machines/nixos/geo02/secrets/secrets.nix @@ -0,0 +1,3 @@ +(import ../../../../keys).mkSecrets [ "geo02" ] [ + # List of secrets for geo02 +] diff --git a/machines/rescue01/_configuration.nix b/machines/nixos/rescue01/_configuration.nix similarity index 100% rename from machines/rescue01/_configuration.nix rename to machines/nixos/rescue01/_configuration.nix diff --git a/machines/rescue01/_hardware-configuration.nix b/machines/nixos/rescue01/_hardware-configuration.nix similarity index 100% rename from machines/rescue01/_hardware-configuration.nix rename to machines/nixos/rescue01/_hardware-configuration.nix diff --git a/machines/rescue01/secrets/secrets.nix b/machines/nixos/rescue01/secrets/secrets.nix similarity index 56% rename from machines/rescue01/secrets/secrets.nix rename to machines/nixos/rescue01/secrets/secrets.nix index 4cc5cdd..961de57 100644 --- a/machines/rescue01/secrets/secrets.nix +++ b/machines/nixos/rescue01/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "rescue01" ] [ +(import ../../../../keys).mkSecrets [ "rescue01" ] [ # List of secrets for rescue01 "stateless-uptime-kuma-password" ] diff --git a/machines/rescue01/secrets/stateless-uptime-kuma-password b/machines/nixos/rescue01/secrets/stateless-uptime-kuma-password similarity index 100% rename from machines/rescue01/secrets/stateless-uptime-kuma-password rename to machines/nixos/rescue01/secrets/stateless-uptime-kuma-password diff --git a/machines/rescue01/uptime-kuma.nix b/machines/nixos/rescue01/uptime-kuma.nix similarity index 100% rename from machines/rescue01/uptime-kuma.nix rename to machines/nixos/rescue01/uptime-kuma.nix diff --git a/machines/storage01/_configuration.nix b/machines/nixos/storage01/_configuration.nix similarity index 100% rename from machines/storage01/_configuration.nix rename to machines/nixos/storage01/_configuration.nix diff --git a/machines/storage01/_hardware-configuration.nix b/machines/nixos/storage01/_hardware-configuration.nix similarity index 100% rename from machines/storage01/_hardware-configuration.nix rename to machines/nixos/storage01/_hardware-configuration.nix diff --git a/machines/storage01/forgejo-runners.nix b/machines/nixos/storage01/forgejo-runners.nix similarity index 100% rename from machines/storage01/forgejo-runners.nix rename to machines/nixos/storage01/forgejo-runners.nix diff --git a/machines/storage01/forgejo.nix b/machines/nixos/storage01/forgejo.nix similarity index 100% rename from machines/storage01/forgejo.nix rename to machines/nixos/storage01/forgejo.nix diff --git a/machines/storage01/garage.nix b/machines/nixos/storage01/garage.nix similarity index 100% rename from machines/storage01/garage.nix rename to machines/nixos/storage01/garage.nix diff --git a/machines/storage01/influxdb.nix b/machines/nixos/storage01/influxdb.nix similarity index 100% rename from machines/storage01/influxdb.nix rename to machines/nixos/storage01/influxdb.nix diff --git a/machines/storage01/netbird.nix b/machines/nixos/storage01/netbird.nix similarity index 100% rename from machines/storage01/netbird.nix rename to machines/nixos/storage01/netbird.nix diff --git a/machines/storage01/peertube.nix b/machines/nixos/storage01/peertube.nix similarity index 100% rename from machines/storage01/peertube.nix rename to machines/nixos/storage01/peertube.nix diff --git a/machines/storage01/prometheus.nix b/machines/nixos/storage01/prometheus.nix similarity index 100% rename from machines/storage01/prometheus.nix rename to machines/nixos/storage01/prometheus.nix diff --git a/machines/storage01/redirections.nix b/machines/nixos/storage01/redirections.nix similarity index 100% rename from machines/storage01/redirections.nix rename to machines/nixos/storage01/redirections.nix diff --git a/machines/storage01/secrets/bupstash-put_key b/machines/nixos/storage01/secrets/bupstash-put_key similarity index 100% rename from machines/storage01/secrets/bupstash-put_key rename to machines/nixos/storage01/secrets/bupstash-put_key diff --git a/machines/storage01/secrets/forgejo-mailer_password_file b/machines/nixos/storage01/secrets/forgejo-mailer_password_file similarity index 100% rename from machines/storage01/secrets/forgejo-mailer_password_file rename to machines/nixos/storage01/secrets/forgejo-mailer_password_file diff --git a/machines/storage01/secrets/forgejo_runners-token_file b/machines/nixos/storage01/secrets/forgejo_runners-token_file similarity index 100% rename from machines/storage01/secrets/forgejo_runners-token_file rename to machines/nixos/storage01/secrets/forgejo_runners-token_file diff --git a/machines/storage01/secrets/garage-environment_file b/machines/nixos/storage01/secrets/garage-environment_file similarity index 100% rename from machines/storage01/secrets/garage-environment_file rename to machines/nixos/storage01/secrets/garage-environment_file diff --git a/machines/storage01/secrets/influxdb2-grafana_token_file b/machines/nixos/storage01/secrets/influxdb2-grafana_token_file similarity index 100% rename from machines/storage01/secrets/influxdb2-grafana_token_file rename to machines/nixos/storage01/secrets/influxdb2-grafana_token_file diff --git a/machines/storage01/secrets/influxdb2-initial_password_file b/machines/nixos/storage01/secrets/influxdb2-initial_password_file similarity index 100% rename from machines/storage01/secrets/influxdb2-initial_password_file rename to machines/nixos/storage01/secrets/influxdb2-initial_password_file diff --git a/machines/storage01/secrets/influxdb2-initial_token_file b/machines/nixos/storage01/secrets/influxdb2-initial_token_file similarity index 100% rename from machines/storage01/secrets/influxdb2-initial_token_file rename to machines/nixos/storage01/secrets/influxdb2-initial_token_file diff --git a/machines/storage01/secrets/influxdb2-telegraf_token_file b/machines/nixos/storage01/secrets/influxdb2-telegraf_token_file similarity index 100% rename from machines/storage01/secrets/influxdb2-telegraf_token_file rename to machines/nixos/storage01/secrets/influxdb2-telegraf_token_file diff --git a/machines/storage01/secrets/netbird-data_store_encryption_key_file b/machines/nixos/storage01/secrets/netbird-data_store_encryption_key_file similarity index 100% rename from machines/storage01/secrets/netbird-data_store_encryption_key_file rename to machines/nixos/storage01/secrets/netbird-data_store_encryption_key_file diff --git a/machines/storage01/secrets/netbird-relay_environment_file b/machines/nixos/storage01/secrets/netbird-relay_environment_file similarity index 100% rename from machines/storage01/secrets/netbird-relay_environment_file rename to machines/nixos/storage01/secrets/netbird-relay_environment_file diff --git a/machines/storage01/secrets/netbird-relay_secret_file b/machines/nixos/storage01/secrets/netbird-relay_secret_file similarity index 100% rename from machines/storage01/secrets/netbird-relay_secret_file rename to machines/nixos/storage01/secrets/netbird-relay_secret_file diff --git a/machines/storage01/secrets/nginx-tvix-store-password b/machines/nixos/storage01/secrets/nginx-tvix-store-password similarity index 100% rename from machines/storage01/secrets/nginx-tvix-store-password rename to machines/nixos/storage01/secrets/nginx-tvix-store-password diff --git a/machines/storage01/secrets/nginx-tvix-store-password-ci b/machines/nixos/storage01/secrets/nginx-tvix-store-password-ci similarity index 100% rename from machines/storage01/secrets/nginx-tvix-store-password-ci rename to machines/nixos/storage01/secrets/nginx-tvix-store-password-ci diff --git a/machines/storage01/secrets/peertube-secrets_file b/machines/nixos/storage01/secrets/peertube-secrets_file similarity index 100% rename from machines/storage01/secrets/peertube-secrets_file rename to machines/nixos/storage01/secrets/peertube-secrets_file diff --git a/machines/storage01/secrets/peertube-service_environment_file b/machines/nixos/storage01/secrets/peertube-service_environment_file similarity index 100% rename from machines/storage01/secrets/peertube-service_environment_file rename to machines/nixos/storage01/secrets/peertube-service_environment_file diff --git a/machines/storage01/secrets/peertube-smtp_password_file b/machines/nixos/storage01/secrets/peertube-smtp_password_file similarity index 100% rename from machines/storage01/secrets/peertube-smtp_password_file rename to machines/nixos/storage01/secrets/peertube-smtp_password_file diff --git a/machines/storage01/secrets/prometheus-garage_api b/machines/nixos/storage01/secrets/prometheus-garage_api similarity index 100% rename from machines/storage01/secrets/prometheus-garage_api rename to machines/nixos/storage01/secrets/prometheus-garage_api diff --git a/machines/storage01/secrets/prometheus-uptime-kuma-apikey b/machines/nixos/storage01/secrets/prometheus-uptime-kuma-apikey similarity index 100% rename from machines/storage01/secrets/prometheus-uptime-kuma-apikey rename to machines/nixos/storage01/secrets/prometheus-uptime-kuma-apikey diff --git a/machines/storage01/secrets/prometheus-web_config_file b/machines/nixos/storage01/secrets/prometheus-web_config_file similarity index 100% rename from machines/storage01/secrets/prometheus-web_config_file rename to machines/nixos/storage01/secrets/prometheus-web_config_file diff --git a/machines/storage01/secrets/secrets.nix b/machines/nixos/storage01/secrets/secrets.nix similarity index 92% rename from machines/storage01/secrets/secrets.nix rename to machines/nixos/storage01/secrets/secrets.nix index 63a10d7..d74e5d3 100644 --- a/machines/storage01/secrets/secrets.nix +++ b/machines/nixos/storage01/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "storage01" ] [ +(import ../../../../keys).mkSecrets [ "storage01" ] [ # List of secrets for storage01 "bupstash-put_key" "forgejo-mailer_password_file" diff --git a/machines/storage01/secrets/tvix-store-infra-signing-key b/machines/nixos/storage01/secrets/tvix-store-infra-signing-key similarity index 100% rename from machines/storage01/secrets/tvix-store-infra-signing-key rename to machines/nixos/storage01/secrets/tvix-store-infra-signing-key diff --git a/machines/storage01/tvix-cache/cache-settings.nix b/machines/nixos/storage01/tvix-cache/cache-settings.nix similarity index 100% rename from machines/storage01/tvix-cache/cache-settings.nix rename to machines/nixos/storage01/tvix-cache/cache-settings.nix diff --git a/machines/storage01/tvix-cache/default.nix b/machines/nixos/storage01/tvix-cache/default.nix similarity index 100% rename from machines/storage01/tvix-cache/default.nix rename to machines/nixos/storage01/tvix-cache/default.nix diff --git a/machines/storage01/tvix-cache/package/Cargo.lock b/machines/nixos/storage01/tvix-cache/package/Cargo.lock similarity index 100% rename from machines/storage01/tvix-cache/package/Cargo.lock rename to machines/nixos/storage01/tvix-cache/package/Cargo.lock diff --git a/machines/storage01/tvix-cache/package/default.nix b/machines/nixos/storage01/tvix-cache/package/default.nix similarity index 100% rename from machines/storage01/tvix-cache/package/default.nix rename to machines/nixos/storage01/tvix-cache/package/default.nix diff --git a/machines/storage01/victoria-metrics.nix b/machines/nixos/storage01/victoria-metrics.nix similarity index 100% rename from machines/storage01/victoria-metrics.nix rename to machines/nixos/storage01/victoria-metrics.nix diff --git a/machines/vault01/_configuration.nix b/machines/nixos/vault01/_configuration.nix similarity index 100% rename from machines/vault01/_configuration.nix rename to machines/nixos/vault01/_configuration.nix diff --git a/machines/vault01/_hardware-configuration.nix b/machines/nixos/vault01/_hardware-configuration.nix similarity index 100% rename from machines/vault01/_hardware-configuration.nix rename to machines/nixos/vault01/_hardware-configuration.nix diff --git a/machines/vault01/k-radius/default.nix b/machines/nixos/vault01/k-radius/default.nix similarity index 100% rename from machines/vault01/k-radius/default.nix rename to machines/nixos/vault01/k-radius/default.nix diff --git a/machines/vault01/k-radius/module.nix b/machines/nixos/vault01/k-radius/module.nix similarity index 100% rename from machines/vault01/k-radius/module.nix rename to machines/nixos/vault01/k-radius/module.nix diff --git a/machines/vault01/k-radius/packages/01-python_path.patch b/machines/nixos/vault01/k-radius/packages/01-python_path.patch similarity index 100% rename from machines/vault01/k-radius/packages/01-python_path.patch rename to machines/nixos/vault01/k-radius/packages/01-python_path.patch diff --git a/machines/vault01/k-radius/packages/pykanidm.nix b/machines/nixos/vault01/k-radius/packages/pykanidm.nix similarity index 100% rename from machines/vault01/k-radius/packages/pykanidm.nix rename to machines/nixos/vault01/k-radius/packages/pykanidm.nix diff --git a/machines/vault01/k-radius/packages/rlm_python.nix b/machines/nixos/vault01/k-radius/packages/rlm_python.nix similarity index 100% rename from machines/vault01/k-radius/packages/rlm_python.nix rename to machines/nixos/vault01/k-radius/packages/rlm_python.nix diff --git a/machines/vault01/networking.nix b/machines/nixos/vault01/networking.nix similarity index 100% rename from machines/vault01/networking.nix rename to machines/nixos/vault01/networking.nix diff --git a/machines/vault01/secrets/eatonmon-password_file b/machines/nixos/vault01/secrets/eatonmon-password_file similarity index 100% rename from machines/vault01/secrets/eatonmon-password_file rename to machines/nixos/vault01/secrets/eatonmon-password_file diff --git a/machines/vault01/secrets/radius-ap-radius-secret_file b/machines/nixos/vault01/secrets/radius-ap-radius-secret_file similarity index 100% rename from machines/vault01/secrets/radius-ap-radius-secret_file rename to machines/nixos/vault01/secrets/radius-ap-radius-secret_file diff --git a/machines/vault01/secrets/radius-auth_token_file b/machines/nixos/vault01/secrets/radius-auth_token_file similarity index 100% rename from machines/vault01/secrets/radius-auth_token_file rename to machines/nixos/vault01/secrets/radius-auth_token_file diff --git a/machines/vault01/secrets/radius-ca_pem_file b/machines/nixos/vault01/secrets/radius-ca_pem_file similarity index 100% rename from machines/vault01/secrets/radius-ca_pem_file rename to machines/nixos/vault01/secrets/radius-ca_pem_file diff --git a/machines/vault01/secrets/radius-cert_pem_file b/machines/nixos/vault01/secrets/radius-cert_pem_file similarity index 100% rename from machines/vault01/secrets/radius-cert_pem_file rename to machines/nixos/vault01/secrets/radius-cert_pem_file diff --git a/machines/vault01/secrets/radius-dh_pem_file b/machines/nixos/vault01/secrets/radius-dh_pem_file similarity index 100% rename from machines/vault01/secrets/radius-dh_pem_file rename to machines/nixos/vault01/secrets/radius-dh_pem_file diff --git a/machines/vault01/secrets/radius-key_pem_file b/machines/nixos/vault01/secrets/radius-key_pem_file similarity index 100% rename from machines/vault01/secrets/radius-key_pem_file rename to machines/nixos/vault01/secrets/radius-key_pem_file diff --git a/machines/vault01/secrets/radius-private_key_password_file b/machines/nixos/vault01/secrets/radius-private_key_password_file similarity index 100% rename from machines/vault01/secrets/radius-private_key_password_file rename to machines/nixos/vault01/secrets/radius-private_key_password_file diff --git a/machines/vault01/secrets/secrets.nix b/machines/nixos/vault01/secrets/secrets.nix similarity index 83% rename from machines/vault01/secrets/secrets.nix rename to machines/nixos/vault01/secrets/secrets.nix index 48eb730..41cc13f 100644 --- a/machines/vault01/secrets/secrets.nix +++ b/machines/nixos/vault01/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "vault01" ] [ +(import ../../../../keys).mkSecrets [ "vault01" ] [ # List of secrets for vault01 "radius-auth_token_file" "radius-ca_pem_file" diff --git a/machines/vault01/secrets/wg-key b/machines/nixos/vault01/secrets/wg-key similarity index 100% rename from machines/vault01/secrets/wg-key rename to machines/nixos/vault01/secrets/wg-key diff --git a/machines/vault01/ulogd.nix b/machines/nixos/vault01/ulogd.nix similarity index 100% rename from machines/vault01/ulogd.nix rename to machines/nixos/vault01/ulogd.nix diff --git a/machines/vault01/ups.nix b/machines/nixos/vault01/ups.nix similarity index 100% rename from machines/vault01/ups.nix rename to machines/nixos/vault01/ups.nix diff --git a/machines/web01/_configuration.nix b/machines/nixos/web01/_configuration.nix similarity index 100% rename from machines/web01/_configuration.nix rename to machines/nixos/web01/_configuration.nix diff --git a/machines/web01/_hardware-configuration.nix b/machines/nixos/web01/_hardware-configuration.nix similarity index 56% rename from machines/web01/_hardware-configuration.nix rename to machines/nixos/web01/_hardware-configuration.nix index d4ca50c..42bdc7e 100644 --- a/machines/web01/_hardware-configuration.nix +++ b/machines/nixos/web01/_hardware-configuration.nix @@ -1,17 +1,12 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ modulesPath, ... }: +{ modulesPath, sources, ... }: { imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ( - let - sources = import ../../npins; - in - sources.disko + "/module.nix" - ) + "${modulesPath}/profiles/qemu-guest.nix" + "${sources.disko}/module.nix" ./disko.nix ]; } diff --git a/machines/web01/castopod.nix b/machines/nixos/web01/castopod.nix similarity index 100% rename from machines/web01/castopod.nix rename to machines/nixos/web01/castopod.nix diff --git a/machines/web01/crabfit/default.nix b/machines/nixos/web01/crabfit/default.nix similarity index 100% rename from machines/web01/crabfit/default.nix rename to machines/nixos/web01/crabfit/default.nix diff --git a/machines/web01/crabfit/packages/crabfit-api/Cargo.lock b/machines/nixos/web01/crabfit/packages/crabfit-api/Cargo.lock similarity index 100% rename from machines/web01/crabfit/packages/crabfit-api/Cargo.lock rename to machines/nixos/web01/crabfit/packages/crabfit-api/Cargo.lock diff --git a/machines/web01/crabfit/packages/crabfit-api/addr.patch b/machines/nixos/web01/crabfit/packages/crabfit-api/addr.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-api/addr.patch rename to machines/nixos/web01/crabfit/packages/crabfit-api/addr.patch diff --git a/machines/web01/crabfit/packages/crabfit-api/default.nix b/machines/nixos/web01/crabfit/packages/crabfit-api/default.nix similarity index 100% rename from machines/web01/crabfit/packages/crabfit-api/default.nix rename to machines/nixos/web01/crabfit/packages/crabfit-api/default.nix diff --git a/machines/web01/crabfit/packages/crabfit-frontend/01-privacy.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/01-privacy.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/01-privacy.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/01-privacy.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/02-karla.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/02-karla.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/02-karla.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/02-karla.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/03-standalone.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/03-standalone.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/03-standalone.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/03-standalone.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/04-frontend_url.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/04-frontend_url.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/04-frontend_url.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/04-frontend_url.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/05-dgnum.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/05-dgnum.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/05-dgnum.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/05-dgnum.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/06-download.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/06-download.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/06-download.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/06-download.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/07-colormap.patch b/machines/nixos/web01/crabfit/packages/crabfit-frontend/07-colormap.patch similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/07-colormap.patch rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/07-colormap.patch diff --git a/machines/web01/crabfit/packages/crabfit-frontend/default.nix b/machines/nixos/web01/crabfit/packages/crabfit-frontend/default.nix similarity index 100% rename from machines/web01/crabfit/packages/crabfit-frontend/default.nix rename to machines/nixos/web01/crabfit/packages/crabfit-frontend/default.nix diff --git a/machines/web01/crabfit/packages/default.nix b/machines/nixos/web01/crabfit/packages/default.nix similarity index 100% rename from machines/web01/crabfit/packages/default.nix rename to machines/nixos/web01/crabfit/packages/default.nix diff --git a/machines/web01/disko.nix b/machines/nixos/web01/disko.nix similarity index 100% rename from machines/web01/disko.nix rename to machines/nixos/web01/disko.nix diff --git a/machines/web01/dolibarr.nix b/machines/nixos/web01/dolibarr.nix similarity index 100% rename from machines/web01/dolibarr.nix rename to machines/nixos/web01/dolibarr.nix diff --git a/machines/web01/kahulm.nix b/machines/nixos/web01/kahulm.nix similarity index 100% rename from machines/web01/kahulm.nix rename to machines/nixos/web01/kahulm.nix diff --git a/machines/web01/linkal/default.nix b/machines/nixos/web01/linkal/default.nix similarity index 100% rename from machines/web01/linkal/default.nix rename to machines/nixos/web01/linkal/default.nix diff --git a/machines/web01/linkal/metis-to-linkal.nix b/machines/nixos/web01/linkal/metis-to-linkal.nix similarity index 100% rename from machines/web01/linkal/metis-to-linkal.nix rename to machines/nixos/web01/linkal/metis-to-linkal.nix diff --git a/machines/web01/linkal/module.nix b/machines/nixos/web01/linkal/module.nix similarity index 100% rename from machines/web01/linkal/module.nix rename to machines/nixos/web01/linkal/module.nix diff --git a/machines/web01/matterbridge.nix b/machines/nixos/web01/matterbridge.nix similarity index 100% rename from machines/web01/matterbridge.nix rename to machines/nixos/web01/matterbridge.nix diff --git a/machines/web01/metis/default.nix b/machines/nixos/web01/metis/default.nix similarity index 100% rename from machines/web01/metis/default.nix rename to machines/nixos/web01/metis/default.nix diff --git a/machines/web01/netbox.nix b/machines/nixos/web01/netbox.nix similarity index 100% rename from machines/web01/netbox.nix rename to machines/nixos/web01/netbox.nix diff --git a/machines/web01/ntfy-sh.nix b/machines/nixos/web01/ntfy-sh.nix similarity index 100% rename from machines/web01/ntfy-sh.nix rename to machines/nixos/web01/ntfy-sh.nix diff --git a/machines/web01/redirections.nix b/machines/nixos/web01/redirections.nix similarity index 100% rename from machines/web01/redirections.nix rename to machines/nixos/web01/redirections.nix diff --git a/machines/web01/secrets/acme-certs_secret b/machines/nixos/web01/secrets/acme-certs_secret similarity index 100% rename from machines/web01/secrets/acme-certs_secret rename to machines/nixos/web01/secrets/acme-certs_secret diff --git a/machines/web01/secrets/bupstash-put_key b/machines/nixos/web01/secrets/bupstash-put_key similarity index 100% rename from machines/web01/secrets/bupstash-put_key rename to machines/nixos/web01/secrets/bupstash-put_key diff --git a/machines/web01/secrets/castopod-environment_file b/machines/nixos/web01/secrets/castopod-environment_file similarity index 100% rename from machines/web01/secrets/castopod-environment_file rename to machines/nixos/web01/secrets/castopod-environment_file diff --git a/machines/web01/secrets/kahulm-session_secret b/machines/nixos/web01/secrets/kahulm-session_secret similarity index 100% rename from machines/web01/secrets/kahulm-session_secret rename to machines/nixos/web01/secrets/kahulm-session_secret diff --git a/machines/web01/secrets/matterbridge-config_file b/machines/nixos/web01/secrets/matterbridge-config_file similarity index 100% rename from machines/web01/secrets/matterbridge-config_file rename to machines/nixos/web01/secrets/matterbridge-config_file diff --git a/machines/web01/secrets/named-bind_dnskeys_conf b/machines/nixos/web01/secrets/named-bind_dnskeys_conf similarity index 100% rename from machines/web01/secrets/named-bind_dnskeys_conf rename to machines/nixos/web01/secrets/named-bind_dnskeys_conf diff --git a/machines/web01/secrets/netbox-environment_file b/machines/nixos/web01/secrets/netbox-environment_file similarity index 100% rename from machines/web01/secrets/netbox-environment_file rename to machines/nixos/web01/secrets/netbox-environment_file diff --git a/machines/web01/secrets/ntfy_sh-environment_file b/machines/nixos/web01/secrets/ntfy_sh-environment_file similarity index 100% rename from machines/web01/secrets/ntfy_sh-environment_file rename to machines/nixos/web01/secrets/ntfy_sh-environment_file diff --git a/machines/web01/secrets/secrets.nix b/machines/nixos/web01/secrets/secrets.nix similarity index 83% rename from machines/web01/secrets/secrets.nix rename to machines/nixos/web01/secrets/secrets.nix index ed65294..5c53c33 100644 --- a/machines/web01/secrets/secrets.nix +++ b/machines/nixos/web01/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "web01" ] [ +(import ../../../../keys).mkSecrets [ "web01" ] [ # List of secrets for web01 "acme-certs_secret" "bupstash-put_key" diff --git a/machines/web01/static/default.nix b/machines/nixos/web01/static/default.nix similarity index 100% rename from machines/web01/static/default.nix rename to machines/nixos/web01/static/default.nix diff --git a/machines/web01/static/npins/default.nix b/machines/nixos/web01/static/npins/default.nix similarity index 100% rename from machines/web01/static/npins/default.nix rename to machines/nixos/web01/static/npins/default.nix diff --git a/machines/web01/static/npins/sources.json b/machines/nixos/web01/static/npins/sources.json similarity index 100% rename from machines/web01/static/npins/sources.json rename to machines/nixos/web01/static/npins/sources.json diff --git a/machines/web01/wordpress/default.nix b/machines/nixos/web01/wordpress/default.nix similarity index 100% rename from machines/web01/wordpress/default.nix rename to machines/nixos/web01/wordpress/default.nix diff --git a/machines/web01/wordpress/module.nix b/machines/nixos/web01/wordpress/module.nix similarity index 100% rename from machines/web01/wordpress/module.nix rename to machines/nixos/web01/wordpress/module.nix diff --git a/machines/web02/_configuration.nix b/machines/nixos/web02/_configuration.nix similarity index 100% rename from machines/web02/_configuration.nix rename to machines/nixos/web02/_configuration.nix diff --git a/machines/web02/_hardware-configuration.nix b/machines/nixos/web02/_hardware-configuration.nix similarity index 100% rename from machines/web02/_hardware-configuration.nix rename to machines/nixos/web02/_hardware-configuration.nix diff --git a/machines/web02/cas-eleves/01-pytest-cas.patch b/machines/nixos/web02/cas-eleves/01-pytest-cas.patch similarity index 100% rename from machines/web02/cas-eleves/01-pytest-cas.patch rename to machines/nixos/web02/cas-eleves/01-pytest-cas.patch diff --git a/machines/web02/cas-eleves/default.nix b/machines/nixos/web02/cas-eleves/default.nix similarity index 100% rename from machines/web02/cas-eleves/default.nix rename to machines/nixos/web02/cas-eleves/default.nix diff --git a/machines/web02/kadenios/default.nix b/machines/nixos/web02/kadenios/default.nix similarity index 100% rename from machines/web02/kadenios/default.nix rename to machines/nixos/web02/kadenios/default.nix diff --git a/machines/web02/secrets/cas_eleves-secret_key_file b/machines/nixos/web02/secrets/cas_eleves-secret_key_file similarity index 100% rename from machines/web02/secrets/cas_eleves-secret_key_file rename to machines/nixos/web02/secrets/cas_eleves-secret_key_file diff --git a/machines/web02/secrets/kadenios-email_password_file b/machines/nixos/web02/secrets/kadenios-email_password_file similarity index 100% rename from machines/web02/secrets/kadenios-email_password_file rename to machines/nixos/web02/secrets/kadenios-email_password_file diff --git a/machines/web02/secrets/kadenios-secret_key_file b/machines/nixos/web02/secrets/kadenios-secret_key_file similarity index 100% rename from machines/web02/secrets/kadenios-secret_key_file rename to machines/nixos/web02/secrets/kadenios-secret_key_file diff --git a/machines/web02/secrets/secrets.nix b/machines/nixos/web02/secrets/secrets.nix similarity index 71% rename from machines/web02/secrets/secrets.nix rename to machines/nixos/web02/secrets/secrets.nix index 6c96a1b..f6a3ff7 100644 --- a/machines/web02/secrets/secrets.nix +++ b/machines/nixos/web02/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "web02" ] [ +(import ../../../../keys).mkSecrets [ "web02" ] [ # List of secrets for web02 "cas_eleves-secret_key_file" "kadenios-secret_key_file" diff --git a/machines/web03/_configuration.nix b/machines/nixos/web03/_configuration.nix similarity index 100% rename from machines/web03/_configuration.nix rename to machines/nixos/web03/_configuration.nix diff --git a/machines/web03/_hardware-configuration.nix b/machines/nixos/web03/_hardware-configuration.nix similarity index 100% rename from machines/web03/_hardware-configuration.nix rename to machines/nixos/web03/_hardware-configuration.nix diff --git a/machines/web03/django-apps/annuaire.nix b/machines/nixos/web03/django-apps/annuaire.nix similarity index 100% rename from machines/web03/django-apps/annuaire.nix rename to machines/nixos/web03/django-apps/annuaire.nix diff --git a/machines/web03/django-apps/bocal.nix b/machines/nixos/web03/django-apps/bocal.nix similarity index 100% rename from machines/web03/django-apps/bocal.nix rename to machines/nixos/web03/django-apps/bocal.nix diff --git a/machines/web03/django-apps/default.nix b/machines/nixos/web03/django-apps/default.nix similarity index 100% rename from machines/web03/django-apps/default.nix rename to machines/nixos/web03/django-apps/default.nix diff --git a/machines/web03/django-apps/gestiojeux.nix b/machines/nixos/web03/django-apps/gestiojeux.nix similarity index 100% rename from machines/web03/django-apps/gestiojeux.nix rename to machines/nixos/web03/django-apps/gestiojeux.nix diff --git a/machines/web03/django-apps/interludes.nix b/machines/nixos/web03/django-apps/interludes.nix similarity index 100% rename from machines/web03/django-apps/interludes.nix rename to machines/nixos/web03/django-apps/interludes.nix diff --git a/machines/web03/django-apps/wikiens.nix b/machines/nixos/web03/django-apps/wikiens.nix similarity index 100% rename from machines/web03/django-apps/wikiens.nix rename to machines/nixos/web03/django-apps/wikiens.nix diff --git a/machines/web03/secrets/dj_annuaire-secret_key_file b/machines/nixos/web03/secrets/dj_annuaire-secret_key_file similarity index 100% rename from machines/web03/secrets/dj_annuaire-secret_key_file rename to machines/nixos/web03/secrets/dj_annuaire-secret_key_file diff --git a/machines/web03/secrets/dj_bocal-secret_key_file b/machines/nixos/web03/secrets/dj_bocal-secret_key_file similarity index 100% rename from machines/web03/secrets/dj_bocal-secret_key_file rename to machines/nixos/web03/secrets/dj_bocal-secret_key_file diff --git a/machines/web03/secrets/dj_gestiojeux-secret_key_file b/machines/nixos/web03/secrets/dj_gestiojeux-secret_key_file similarity index 100% rename from machines/web03/secrets/dj_gestiojeux-secret_key_file rename to machines/nixos/web03/secrets/dj_gestiojeux-secret_key_file diff --git a/machines/web03/secrets/dj_interludes-email_host_password_file b/machines/nixos/web03/secrets/dj_interludes-email_host_password_file similarity index 100% rename from machines/web03/secrets/dj_interludes-email_host_password_file rename to machines/nixos/web03/secrets/dj_interludes-email_host_password_file diff --git a/machines/web03/secrets/dj_interludes-secret_key_file b/machines/nixos/web03/secrets/dj_interludes-secret_key_file similarity index 100% rename from machines/web03/secrets/dj_interludes-secret_key_file rename to machines/nixos/web03/secrets/dj_interludes-secret_key_file diff --git a/machines/web03/secrets/dj_wikiens-secret_key_file b/machines/nixos/web03/secrets/dj_wikiens-secret_key_file similarity index 100% rename from machines/web03/secrets/dj_wikiens-secret_key_file rename to machines/nixos/web03/secrets/dj_wikiens-secret_key_file diff --git a/machines/web03/secrets/secrets.nix b/machines/nixos/web03/secrets/secrets.nix similarity index 88% rename from machines/web03/secrets/secrets.nix rename to machines/nixos/web03/secrets/secrets.nix index a689416..b02247b 100644 --- a/machines/web03/secrets/secrets.nix +++ b/machines/nixos/web03/secrets/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ "web03" ] [ +(import ../../../../keys).mkSecrets [ "web03" ] [ # List of secrets for web03 "dj_annuaire-secret_key_file" "dj_bocal-secret_key_file" diff --git a/machines/web03/secrets/webhook-annuaire_token b/machines/nixos/web03/secrets/webhook-annuaire_token similarity index 100% rename from machines/web03/secrets/webhook-annuaire_token rename to machines/nixos/web03/secrets/webhook-annuaire_token diff --git a/machines/web03/secrets/webhook-bocal_token b/machines/nixos/web03/secrets/webhook-bocal_token similarity index 100% rename from machines/web03/secrets/webhook-bocal_token rename to machines/nixos/web03/secrets/webhook-bocal_token diff --git a/machines/web03/secrets/webhook-gestiojeux_token b/machines/nixos/web03/secrets/webhook-gestiojeux_token similarity index 100% rename from machines/web03/secrets/webhook-gestiojeux_token rename to machines/nixos/web03/secrets/webhook-gestiojeux_token diff --git a/machines/web03/secrets/webhook-interludes_token b/machines/nixos/web03/secrets/webhook-interludes_token similarity index 100% rename from machines/web03/secrets/webhook-interludes_token rename to machines/nixos/web03/secrets/webhook-interludes_token diff --git a/machines/web03/secrets/webhook-wikiens_token b/machines/nixos/web03/secrets/webhook-wikiens_token similarity index 100% rename from machines/web03/secrets/webhook-wikiens_token rename to machines/nixos/web03/secrets/webhook-wikiens_token diff --git a/meta/nixpkgs.nix b/meta/nixpkgs.nix index 5b4cafe..a2ffc10 100644 --- a/meta/nixpkgs.nix +++ b/meta/nixpkgs.nix @@ -12,4 +12,9 @@ "zyxel-nwa50ax" "nixos" ]; + + categories = { + nixos = "nixos"; + zyxel-nwa50ax = "liminix"; + }; } diff --git a/modules/dgn-netbox-agent/secrets/secrets.nix b/modules/dgn-netbox-agent/secrets/secrets.nix deleted file mode 100644 index ebab356..0000000 --- a/modules/dgn-netbox-agent/secrets/secrets.nix +++ /dev/null @@ -1 +0,0 @@ -{ netbox-agent.publicKeys = (import ../../keys).machineKeys; } diff --git a/modules/dgn-notify/secrets.nix b/modules/dgn-notify/secrets.nix deleted file mode 100644 index d6e3e80..0000000 --- a/modules/dgn-notify/secrets.nix +++ /dev/null @@ -1 +0,0 @@ -{ mail.publicKeys = (import ../../keys).machineKeys; } diff --git a/modules/dgn-records/secrets.nix b/modules/dgn-records/secrets.nix deleted file mode 100644 index 68a82cd..0000000 --- a/modules/dgn-records/secrets.nix +++ /dev/null @@ -1 +0,0 @@ -{ __arkheon-token_file.publicKeys = (import ../../keys).machineKeys; } diff --git a/modules/generic/default.nix b/modules/generic/default.nix new file mode 100644 index 0000000..e140d9d --- /dev/null +++ b/modules/generic/default.nix @@ -0,0 +1,3 @@ +{ + imports = [ ]; +} diff --git a/modules/default.nix b/modules/nixos/default.nix similarity index 100% rename from modules/default.nix rename to modules/nixos/default.nix diff --git a/modules/dgn-access-control.nix b/modules/nixos/dgn-access-control.nix similarity index 100% rename from modules/dgn-access-control.nix rename to modules/nixos/dgn-access-control.nix diff --git a/modules/dgn-acme.nix b/modules/nixos/dgn-acme.nix similarity index 100% rename from modules/dgn-acme.nix rename to modules/nixos/dgn-acme.nix diff --git a/modules/dgn-backups/default.nix b/modules/nixos/dgn-backups/default.nix similarity index 100% rename from modules/dgn-backups/default.nix rename to modules/nixos/dgn-backups/default.nix diff --git a/modules/dgn-backups/keys/compute01.key b/modules/nixos/dgn-backups/keys/compute01.key similarity index 100% rename from modules/dgn-backups/keys/compute01.key rename to modules/nixos/dgn-backups/keys/compute01.key diff --git a/modules/dgn-backups/keys/secrets.nix b/modules/nixos/dgn-backups/keys/secrets.nix similarity index 55% rename from modules/dgn-backups/keys/secrets.nix rename to modules/nixos/dgn-backups/keys/secrets.nix index 66cf873..1bbae23 100644 --- a/modules/dgn-backups/keys/secrets.nix +++ b/modules/nixos/dgn-backups/keys/secrets.nix @@ -1,4 +1,4 @@ -(import ../../../keys).mkSecrets [ ] [ +(import ../../../../keys).mkSecrets [ ] [ "compute01.key" "storage01.key" "web01.key" diff --git a/modules/dgn-backups/keys/storage01.key b/modules/nixos/dgn-backups/keys/storage01.key similarity index 100% rename from modules/dgn-backups/keys/storage01.key rename to modules/nixos/dgn-backups/keys/storage01.key diff --git a/modules/dgn-backups/keys/web01.key b/modules/nixos/dgn-backups/keys/web01.key similarity index 100% rename from modules/dgn-backups/keys/web01.key rename to modules/nixos/dgn-backups/keys/web01.key diff --git a/modules/dgn-chatops/.envrc b/modules/nixos/dgn-chatops/.envrc similarity index 100% rename from modules/dgn-chatops/.envrc rename to modules/nixos/dgn-chatops/.envrc diff --git a/modules/dgn-chatops/default.nix b/modules/nixos/dgn-chatops/default.nix similarity index 100% rename from modules/dgn-chatops/default.nix rename to modules/nixos/dgn-chatops/default.nix diff --git a/modules/dgn-chatops/ircrobots.nix b/modules/nixos/dgn-chatops/ircrobots.nix similarity index 100% rename from modules/dgn-chatops/ircrobots.nix rename to modules/nixos/dgn-chatops/ircrobots.nix diff --git a/modules/dgn-chatops/pypika-tortoise.nix b/modules/nixos/dgn-chatops/pypika-tortoise.nix similarity index 100% rename from modules/dgn-chatops/pypika-tortoise.nix rename to modules/nixos/dgn-chatops/pypika-tortoise.nix diff --git a/modules/dgn-chatops/pyproject.toml b/modules/nixos/dgn-chatops/pyproject.toml similarity index 100% rename from modules/dgn-chatops/pyproject.toml rename to modules/nixos/dgn-chatops/pyproject.toml diff --git a/modules/dgn-chatops/shell.nix b/modules/nixos/dgn-chatops/shell.nix similarity index 100% rename from modules/dgn-chatops/shell.nix rename to modules/nixos/dgn-chatops/shell.nix diff --git a/modules/dgn-chatops/takumi.py b/modules/nixos/dgn-chatops/takumi.py similarity index 100% rename from modules/dgn-chatops/takumi.py rename to modules/nixos/dgn-chatops/takumi.py diff --git a/modules/dgn-chatops/tortoise-orm.nix b/modules/nixos/dgn-chatops/tortoise-orm.nix similarity index 100% rename from modules/dgn-chatops/tortoise-orm.nix rename to modules/nixos/dgn-chatops/tortoise-orm.nix diff --git a/modules/dgn-console.nix b/modules/nixos/dgn-console.nix similarity index 100% rename from modules/dgn-console.nix rename to modules/nixos/dgn-console.nix diff --git a/modules/dgn-firewall/default.nix b/modules/nixos/dgn-firewall/default.nix similarity index 100% rename from modules/dgn-firewall/default.nix rename to modules/nixos/dgn-firewall/default.nix diff --git a/modules/dgn-firewall/streams.nix b/modules/nixos/dgn-firewall/streams.nix similarity index 100% rename from modules/dgn-firewall/streams.nix rename to modules/nixos/dgn-firewall/streams.nix diff --git a/modules/dgn-hardware.nix b/modules/nixos/dgn-hardware.nix similarity index 100% rename from modules/dgn-hardware.nix rename to modules/nixos/dgn-hardware.nix diff --git a/modules/dgn-netbox-agent/default.nix b/modules/nixos/dgn-netbox-agent/default.nix similarity index 100% rename from modules/dgn-netbox-agent/default.nix rename to modules/nixos/dgn-netbox-agent/default.nix diff --git a/modules/dgn-netbox-agent/module.nix b/modules/nixos/dgn-netbox-agent/module.nix similarity index 100% rename from modules/dgn-netbox-agent/module.nix rename to modules/nixos/dgn-netbox-agent/module.nix diff --git a/modules/dgn-netbox-agent/netifaces2.nix b/modules/nixos/dgn-netbox-agent/netifaces2.nix similarity index 100% rename from modules/dgn-netbox-agent/netifaces2.nix rename to modules/nixos/dgn-netbox-agent/netifaces2.nix diff --git a/modules/dgn-netbox-agent/package.nix b/modules/nixos/dgn-netbox-agent/package.nix similarity index 100% rename from modules/dgn-netbox-agent/package.nix rename to modules/nixos/dgn-netbox-agent/package.nix diff --git a/modules/dgn-netbox-agent/secrets/netbox-agent b/modules/nixos/dgn-netbox-agent/secrets/netbox-agent similarity index 100% rename from modules/dgn-netbox-agent/secrets/netbox-agent rename to modules/nixos/dgn-netbox-agent/secrets/netbox-agent diff --git a/modules/nixos/dgn-netbox-agent/secrets/secrets.nix b/modules/nixos/dgn-netbox-agent/secrets/secrets.nix new file mode 100644 index 0000000..91e0ef0 --- /dev/null +++ b/modules/nixos/dgn-netbox-agent/secrets/secrets.nix @@ -0,0 +1 @@ +{ netbox-agent.publicKeys = (import ../../../keys).machineKeys; } diff --git a/modules/dgn-network.nix b/modules/nixos/dgn-network.nix similarity index 100% rename from modules/dgn-network.nix rename to modules/nixos/dgn-network.nix diff --git a/modules/dgn-node-monitoring.nix b/modules/nixos/dgn-node-monitoring.nix similarity index 100% rename from modules/dgn-node-monitoring.nix rename to modules/nixos/dgn-node-monitoring.nix diff --git a/modules/dgn-notify/default.nix b/modules/nixos/dgn-notify/default.nix similarity index 100% rename from modules/dgn-notify/default.nix rename to modules/nixos/dgn-notify/default.nix diff --git a/modules/dgn-notify/mail b/modules/nixos/dgn-notify/mail similarity index 100% rename from modules/dgn-notify/mail rename to modules/nixos/dgn-notify/mail diff --git a/modules/nixos/dgn-notify/secrets.nix b/modules/nixos/dgn-notify/secrets.nix new file mode 100644 index 0000000..4c7085d --- /dev/null +++ b/modules/nixos/dgn-notify/secrets.nix @@ -0,0 +1 @@ +{ mail.publicKeys = (import ../../../keys).machineKeys; } diff --git a/modules/dgn-records/__arkheon-token_file b/modules/nixos/dgn-records/__arkheon-token_file similarity index 100% rename from modules/dgn-records/__arkheon-token_file rename to modules/nixos/dgn-records/__arkheon-token_file diff --git a/modules/dgn-records/default.nix b/modules/nixos/dgn-records/default.nix similarity index 100% rename from modules/dgn-records/default.nix rename to modules/nixos/dgn-records/default.nix diff --git a/modules/nixos/dgn-records/secrets.nix b/modules/nixos/dgn-records/secrets.nix new file mode 100644 index 0000000..606af67 --- /dev/null +++ b/modules/nixos/dgn-records/secrets.nix @@ -0,0 +1 @@ +{ __arkheon-token_file.publicKeys = (import ../../../keys).machineKeys; } diff --git a/modules/dgn-redirections/default.nix b/modules/nixos/dgn-redirections/default.nix similarity index 100% rename from modules/dgn-redirections/default.nix rename to modules/nixos/dgn-redirections/default.nix diff --git a/modules/dgn-ssh.nix b/modules/nixos/dgn-ssh.nix similarity index 100% rename from modules/dgn-ssh.nix rename to modules/nixos/dgn-ssh.nix diff --git a/modules/dgn-vm-variant.nix b/modules/nixos/dgn-vm-variant.nix similarity index 100% rename from modules/dgn-vm-variant.nix rename to modules/nixos/dgn-vm-variant.nix diff --git a/modules/dgn-web.nix b/modules/nixos/dgn-web.nix similarity index 100% rename from modules/dgn-web.nix rename to modules/nixos/dgn-web.nix diff --git a/modules/django-apps/01-webhook.patch b/modules/nixos/django-apps/01-webhook.patch similarity index 100% rename from modules/django-apps/01-webhook.patch rename to modules/nixos/django-apps/01-webhook.patch diff --git a/modules/django-apps/default.nix b/modules/nixos/django-apps/default.nix similarity index 100% rename from modules/django-apps/default.nix rename to modules/nixos/django-apps/default.nix diff --git a/workflows/eval-nodes.nix b/workflows/eval-nodes.nix index a67bd45..7cd892f 100644 --- a/workflows/eval-nodes.nix +++ b/workflows/eval-nodes.nix @@ -3,7 +3,7 @@ let inherit (lib) attrNames genAttrs; - nodes = attrNames (builtins.readDir ../machines); + nodes = attrNames (import ../meta/nodes.nix); in {