From 79669b27f8767cc7f9b12b578f0a45c59e3587e9 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sat, 2 Mar 2024 14:03:27 +0100 Subject: [PATCH] change nixos -> nix --- flake.nix | 10 +++++----- {nixos => nix}/default.nix | 0 {nixos => nix}/flake/bootstrap/bootstrap.sh | 0 {nixos => nix}/flake/bootstrap/default.nix | 0 {nixos => nix}/flake/checks.nix | 0 {nixos => nix}/flake/deploy.nix | 0 {nixos => nix}/flake/nixos.nix | 0 {nixos => nix}/globals.nix | 0 {nixos => nix}/machines/atlas.nix | 0 {nixos => nix}/machines/bancomart.nix | 0 .../machines/certificates/atlas/host_ed25519.crt | 0 .../machines/certificates/atlas/user_ed25519.crt | 0 .../machines/certificates/jefke/host_ed25519.crt | 0 .../machines/certificates/jefke/user_ed25519.crt | 0 .../machines/certificates/lewis/host_ed25519.crt | 0 .../machines/certificates/lewis/user_ed25519.crt | 0 {nixos => nix}/machines/default.nix | 0 {nixos => nix}/machines/hermes.nix | 0 {nixos => nix}/machines/jefke.nix | 0 {nixos => nix}/machines/lewis.nix | 0 {nixos => nix}/machines/maestro.nix | 0 {nixos => nix}/machines/vpay.nix | 0 {nixos => nix}/machines/warwick.nix | 0 {nixos => nix}/modules/backups.nix | 0 {nixos => nix}/modules/data-sharing.nix | 0 {nixos => nix}/modules/default.nix | 0 {nixos => nix}/modules/globals.nix | 0 {nixos => nix}/modules/networking/default.nix | 0 .../modules/networking/dmz_services/default.nix | 0 .../modules/networking/dmz_services/dnsmasq.nix | 0 .../networking/dmz_services/zones/geokunis2.nl.nix | 0 .../networking/dmz_services/zones/kun.is.nix | 0 {nixos => nix}/modules/ssh-certificates.nix | 0 {nixos => nix}/modules/storage.nix | 0 .../terraform-database/postgresql_server.crt | 0 {nixos => nix}/net.nix | 0 {nixos => nix}/physical.nix | 0 {nixos => nix}/secrets/README.md | 0 {nixos => nix}/secrets/atlas_host_ed25519.age | Bin {nixos => nix}/secrets/atlas_user_ed25519.age | Bin {nixos => nix}/secrets/borg_passphrase.age | 0 {nixos => nix}/secrets/database_passwords.env.age | 0 {nixos => nix}/secrets/ec2_borg_server.pem.age | Bin {nixos => nix}/secrets/jefke_host_ed25519.age | Bin {nixos => nix}/secrets/jefke_user_ed25519.age | Bin {nixos => nix}/secrets/lewis_host_ed25519.age | Bin {nixos => nix}/secrets/lewis_user_ed25519.age | Bin {nixos => nix}/secrets/secrets.nix | 0 {nixos => nix}/virtual/default.nix | 0 {nixos => nix}/virtual/docker_swarm.nix | 0 50 files changed, 5 insertions(+), 5 deletions(-) rename {nixos => nix}/default.nix (100%) rename {nixos => nix}/flake/bootstrap/bootstrap.sh (100%) rename {nixos => nix}/flake/bootstrap/default.nix (100%) rename {nixos => nix}/flake/checks.nix (100%) rename {nixos => nix}/flake/deploy.nix (100%) rename {nixos => nix}/flake/nixos.nix (100%) rename {nixos => nix}/globals.nix (100%) rename {nixos => nix}/machines/atlas.nix (100%) rename {nixos => nix}/machines/bancomart.nix (100%) rename {nixos => nix}/machines/certificates/atlas/host_ed25519.crt (100%) rename {nixos => nix}/machines/certificates/atlas/user_ed25519.crt (100%) rename {nixos => nix}/machines/certificates/jefke/host_ed25519.crt (100%) rename {nixos => nix}/machines/certificates/jefke/user_ed25519.crt (100%) rename {nixos => nix}/machines/certificates/lewis/host_ed25519.crt (100%) rename {nixos => nix}/machines/certificates/lewis/user_ed25519.crt (100%) rename {nixos => nix}/machines/default.nix (100%) rename {nixos => nix}/machines/hermes.nix (100%) rename {nixos => nix}/machines/jefke.nix (100%) rename {nixos => nix}/machines/lewis.nix (100%) rename {nixos => nix}/machines/maestro.nix (100%) rename {nixos => nix}/machines/vpay.nix (100%) rename {nixos => nix}/machines/warwick.nix (100%) rename {nixos => nix}/modules/backups.nix (100%) rename {nixos => nix}/modules/data-sharing.nix (100%) rename {nixos => nix}/modules/default.nix (100%) rename {nixos => nix}/modules/globals.nix (100%) rename {nixos => nix}/modules/networking/default.nix (100%) rename {nixos => nix}/modules/networking/dmz_services/default.nix (100%) rename {nixos => nix}/modules/networking/dmz_services/dnsmasq.nix (100%) rename {nixos => nix}/modules/networking/dmz_services/zones/geokunis2.nl.nix (100%) rename {nixos => nix}/modules/networking/dmz_services/zones/kun.is.nix (100%) rename {nixos => nix}/modules/ssh-certificates.nix (100%) rename {nixos => nix}/modules/storage.nix (100%) rename {nixos => nix}/modules/terraform-database/postgresql_server.crt (100%) rename {nixos => nix}/net.nix (100%) rename {nixos => nix}/physical.nix (100%) rename {nixos => nix}/secrets/README.md (100%) rename {nixos => nix}/secrets/atlas_host_ed25519.age (100%) rename {nixos => nix}/secrets/atlas_user_ed25519.age (100%) rename {nixos => nix}/secrets/borg_passphrase.age (100%) rename {nixos => nix}/secrets/database_passwords.env.age (100%) rename {nixos => nix}/secrets/ec2_borg_server.pem.age (100%) rename {nixos => nix}/secrets/jefke_host_ed25519.age (100%) rename {nixos => nix}/secrets/jefke_user_ed25519.age (100%) rename {nixos => nix}/secrets/lewis_host_ed25519.age (100%) rename {nixos => nix}/secrets/lewis_user_ed25519.age (100%) rename {nixos => nix}/secrets/secrets.nix (100%) rename {nixos => nix}/virtual/default.nix (100%) rename {nixos => nix}/virtual/docker_swarm.nix (100%) diff --git a/flake.nix b/flake.nix index eb83955..dc8375b 100644 --- a/flake.nix +++ b/flake.nix @@ -33,14 +33,14 @@ let hostSystem = "x86_64-linux"; hostPkgs = import nixpkgs { system = hostSystem; }; - machines = (hostPkgs.lib.modules.evalModules { modules = [ (import ./nixos/machines) ]; }).config.machines; + machines = (hostPkgs.lib.modules.evalModules { modules = [ (import ./nix/machines) ]; }).config.machines; physicalMachines = hostPkgs.lib.filterAttrs (n: v: v.isPhysical) machines; in flake-utils.lib.meld (inputs // { inherit hostPkgs machines physicalMachines; }) [ - ./nixos/flake/bootstrap - ./nixos/flake/checks.nix - ./nixos/flake/deploy.nix - ./nixos/flake/nixos.nix + ./nix/flake/bootstrap + ./nix/flake/checks.nix + ./nix/flake/deploy.nix + ./nix/flake/nixos.nix ] // (flake-utils.lib.eachDefaultSystem (system: { formatter = nixpkgs.legacyPackages.${system}.nixfmt; })); diff --git a/nixos/default.nix b/nix/default.nix similarity index 100% rename from nixos/default.nix rename to nix/default.nix diff --git a/nixos/flake/bootstrap/bootstrap.sh b/nix/flake/bootstrap/bootstrap.sh similarity index 100% rename from nixos/flake/bootstrap/bootstrap.sh rename to nix/flake/bootstrap/bootstrap.sh diff --git a/nixos/flake/bootstrap/default.nix b/nix/flake/bootstrap/default.nix similarity index 100% rename from nixos/flake/bootstrap/default.nix rename to nix/flake/bootstrap/default.nix diff --git a/nixos/flake/checks.nix b/nix/flake/checks.nix similarity index 100% rename from nixos/flake/checks.nix rename to nix/flake/checks.nix diff --git a/nixos/flake/deploy.nix b/nix/flake/deploy.nix similarity index 100% rename from nixos/flake/deploy.nix rename to nix/flake/deploy.nix diff --git a/nixos/flake/nixos.nix b/nix/flake/nixos.nix similarity index 100% rename from nixos/flake/nixos.nix rename to nix/flake/nixos.nix diff --git a/nixos/globals.nix b/nix/globals.nix similarity index 100% rename from nixos/globals.nix rename to nix/globals.nix diff --git a/nixos/machines/atlas.nix b/nix/machines/atlas.nix similarity index 100% rename from nixos/machines/atlas.nix rename to nix/machines/atlas.nix diff --git a/nixos/machines/bancomart.nix b/nix/machines/bancomart.nix similarity index 100% rename from nixos/machines/bancomart.nix rename to nix/machines/bancomart.nix diff --git a/nixos/machines/certificates/atlas/host_ed25519.crt b/nix/machines/certificates/atlas/host_ed25519.crt similarity index 100% rename from nixos/machines/certificates/atlas/host_ed25519.crt rename to nix/machines/certificates/atlas/host_ed25519.crt diff --git a/nixos/machines/certificates/atlas/user_ed25519.crt b/nix/machines/certificates/atlas/user_ed25519.crt similarity index 100% rename from nixos/machines/certificates/atlas/user_ed25519.crt rename to nix/machines/certificates/atlas/user_ed25519.crt diff --git a/nixos/machines/certificates/jefke/host_ed25519.crt b/nix/machines/certificates/jefke/host_ed25519.crt similarity index 100% rename from nixos/machines/certificates/jefke/host_ed25519.crt rename to nix/machines/certificates/jefke/host_ed25519.crt diff --git a/nixos/machines/certificates/jefke/user_ed25519.crt b/nix/machines/certificates/jefke/user_ed25519.crt similarity index 100% rename from nixos/machines/certificates/jefke/user_ed25519.crt rename to nix/machines/certificates/jefke/user_ed25519.crt diff --git a/nixos/machines/certificates/lewis/host_ed25519.crt b/nix/machines/certificates/lewis/host_ed25519.crt similarity index 100% rename from nixos/machines/certificates/lewis/host_ed25519.crt rename to nix/machines/certificates/lewis/host_ed25519.crt diff --git a/nixos/machines/certificates/lewis/user_ed25519.crt b/nix/machines/certificates/lewis/user_ed25519.crt similarity index 100% rename from nixos/machines/certificates/lewis/user_ed25519.crt rename to nix/machines/certificates/lewis/user_ed25519.crt diff --git a/nixos/machines/default.nix b/nix/machines/default.nix similarity index 100% rename from nixos/machines/default.nix rename to nix/machines/default.nix diff --git a/nixos/machines/hermes.nix b/nix/machines/hermes.nix similarity index 100% rename from nixos/machines/hermes.nix rename to nix/machines/hermes.nix diff --git a/nixos/machines/jefke.nix b/nix/machines/jefke.nix similarity index 100% rename from nixos/machines/jefke.nix rename to nix/machines/jefke.nix diff --git a/nixos/machines/lewis.nix b/nix/machines/lewis.nix similarity index 100% rename from nixos/machines/lewis.nix rename to nix/machines/lewis.nix diff --git a/nixos/machines/maestro.nix b/nix/machines/maestro.nix similarity index 100% rename from nixos/machines/maestro.nix rename to nix/machines/maestro.nix diff --git a/nixos/machines/vpay.nix b/nix/machines/vpay.nix similarity index 100% rename from nixos/machines/vpay.nix rename to nix/machines/vpay.nix diff --git a/nixos/machines/warwick.nix b/nix/machines/warwick.nix similarity index 100% rename from nixos/machines/warwick.nix rename to nix/machines/warwick.nix diff --git a/nixos/modules/backups.nix b/nix/modules/backups.nix similarity index 100% rename from nixos/modules/backups.nix rename to nix/modules/backups.nix diff --git a/nixos/modules/data-sharing.nix b/nix/modules/data-sharing.nix similarity index 100% rename from nixos/modules/data-sharing.nix rename to nix/modules/data-sharing.nix diff --git a/nixos/modules/default.nix b/nix/modules/default.nix similarity index 100% rename from nixos/modules/default.nix rename to nix/modules/default.nix diff --git a/nixos/modules/globals.nix b/nix/modules/globals.nix similarity index 100% rename from nixos/modules/globals.nix rename to nix/modules/globals.nix diff --git a/nixos/modules/networking/default.nix b/nix/modules/networking/default.nix similarity index 100% rename from nixos/modules/networking/default.nix rename to nix/modules/networking/default.nix diff --git a/nixos/modules/networking/dmz_services/default.nix b/nix/modules/networking/dmz_services/default.nix similarity index 100% rename from nixos/modules/networking/dmz_services/default.nix rename to nix/modules/networking/dmz_services/default.nix diff --git a/nixos/modules/networking/dmz_services/dnsmasq.nix b/nix/modules/networking/dmz_services/dnsmasq.nix similarity index 100% rename from nixos/modules/networking/dmz_services/dnsmasq.nix rename to nix/modules/networking/dmz_services/dnsmasq.nix diff --git a/nixos/modules/networking/dmz_services/zones/geokunis2.nl.nix b/nix/modules/networking/dmz_services/zones/geokunis2.nl.nix similarity index 100% rename from nixos/modules/networking/dmz_services/zones/geokunis2.nl.nix rename to nix/modules/networking/dmz_services/zones/geokunis2.nl.nix diff --git a/nixos/modules/networking/dmz_services/zones/kun.is.nix b/nix/modules/networking/dmz_services/zones/kun.is.nix similarity index 100% rename from nixos/modules/networking/dmz_services/zones/kun.is.nix rename to nix/modules/networking/dmz_services/zones/kun.is.nix diff --git a/nixos/modules/ssh-certificates.nix b/nix/modules/ssh-certificates.nix similarity index 100% rename from nixos/modules/ssh-certificates.nix rename to nix/modules/ssh-certificates.nix diff --git a/nixos/modules/storage.nix b/nix/modules/storage.nix similarity index 100% rename from nixos/modules/storage.nix rename to nix/modules/storage.nix diff --git a/nixos/modules/terraform-database/postgresql_server.crt b/nix/modules/terraform-database/postgresql_server.crt similarity index 100% rename from nixos/modules/terraform-database/postgresql_server.crt rename to nix/modules/terraform-database/postgresql_server.crt diff --git a/nixos/net.nix b/nix/net.nix similarity index 100% rename from nixos/net.nix rename to nix/net.nix diff --git a/nixos/physical.nix b/nix/physical.nix similarity index 100% rename from nixos/physical.nix rename to nix/physical.nix diff --git a/nixos/secrets/README.md b/nix/secrets/README.md similarity index 100% rename from nixos/secrets/README.md rename to nix/secrets/README.md diff --git a/nixos/secrets/atlas_host_ed25519.age b/nix/secrets/atlas_host_ed25519.age similarity index 100% rename from nixos/secrets/atlas_host_ed25519.age rename to nix/secrets/atlas_host_ed25519.age diff --git a/nixos/secrets/atlas_user_ed25519.age b/nix/secrets/atlas_user_ed25519.age similarity index 100% rename from nixos/secrets/atlas_user_ed25519.age rename to nix/secrets/atlas_user_ed25519.age diff --git a/nixos/secrets/borg_passphrase.age b/nix/secrets/borg_passphrase.age similarity index 100% rename from nixos/secrets/borg_passphrase.age rename to nix/secrets/borg_passphrase.age diff --git a/nixos/secrets/database_passwords.env.age b/nix/secrets/database_passwords.env.age similarity index 100% rename from nixos/secrets/database_passwords.env.age rename to nix/secrets/database_passwords.env.age diff --git a/nixos/secrets/ec2_borg_server.pem.age b/nix/secrets/ec2_borg_server.pem.age similarity index 100% rename from nixos/secrets/ec2_borg_server.pem.age rename to nix/secrets/ec2_borg_server.pem.age diff --git a/nixos/secrets/jefke_host_ed25519.age b/nix/secrets/jefke_host_ed25519.age similarity index 100% rename from nixos/secrets/jefke_host_ed25519.age rename to nix/secrets/jefke_host_ed25519.age diff --git a/nixos/secrets/jefke_user_ed25519.age b/nix/secrets/jefke_user_ed25519.age similarity index 100% rename from nixos/secrets/jefke_user_ed25519.age rename to nix/secrets/jefke_user_ed25519.age diff --git a/nixos/secrets/lewis_host_ed25519.age b/nix/secrets/lewis_host_ed25519.age similarity index 100% rename from nixos/secrets/lewis_host_ed25519.age rename to nix/secrets/lewis_host_ed25519.age diff --git a/nixos/secrets/lewis_user_ed25519.age b/nix/secrets/lewis_user_ed25519.age similarity index 100% rename from nixos/secrets/lewis_user_ed25519.age rename to nix/secrets/lewis_user_ed25519.age diff --git a/nixos/secrets/secrets.nix b/nix/secrets/secrets.nix similarity index 100% rename from nixos/secrets/secrets.nix rename to nix/secrets/secrets.nix diff --git a/nixos/virtual/default.nix b/nix/virtual/default.nix similarity index 100% rename from nixos/virtual/default.nix rename to nix/virtual/default.nix diff --git a/nixos/virtual/docker_swarm.nix b/nix/virtual/docker_swarm.nix similarity index 100% rename from nixos/virtual/docker_swarm.nix rename to nix/virtual/docker_swarm.nix