From 6d258fe5ae3b57ce7d4143d7627158a52cf577e4 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Fri, 29 Dec 2023 12:47:59 +0100 Subject: [PATCH] restructure code --- flake.nix | 4 ++-- configuration.nix => nixos/default.nix | 0 .../machines}/atlas_host_ed25519-cert.pub | 0 .../machines}/atlas_user_ed25519-cert.pub | 0 {machines => nixos/machines}/default.nix | 0 .../machines}/jefke_host_ed25519-cert.pub | 0 .../machines}/jefke_user_ed25519-cert.pub | 0 .../machines}/lewis_host_ed25519-cert.pub | 0 .../machines}/lewis_user_ed25519-cert.pub | 0 {modules => nixos/modules}/custom/backups.nix | 0 {modules => nixos/modules}/custom/data-disk.nix | 0 {modules => nixos/modules}/custom/default.nix | 0 {modules => nixos/modules}/custom/disko.nix | 0 {modules => nixos/modules}/custom/k3s/bootstrap.nix | 0 {modules => nixos/modules}/custom/k3s/default.nix | 0 .../modules}/custom/ssh-certificates.nix | 0 .../modules}/custom/terraform-database.nix | 0 {modules => nixos/modules}/disk-config.nix | 0 .../postgresql_server.crt | 0 {secrets => nixos/secrets}/README.md | 0 {secrets => nixos/secrets}/atlas_host_ed25519.age | Bin {secrets => nixos/secrets}/atlas_user_ed25519.age | Bin {secrets => nixos/secrets}/jefke_host_ed25519.age | Bin {secrets => nixos/secrets}/jefke_user_ed25519.age | Bin {secrets => nixos/secrets}/lewis_host_ed25519.age | Bin {secrets => nixos/secrets}/lewis_user_ed25519.age | 0 .../secrets}/postgresql_server.key.age | Bin {secrets => nixos/secrets}/secrets.nix | 0 28 files changed, 2 insertions(+), 2 deletions(-) rename configuration.nix => nixos/default.nix (100%) rename {machines => nixos/machines}/atlas_host_ed25519-cert.pub (100%) rename {machines => nixos/machines}/atlas_user_ed25519-cert.pub (100%) rename {machines => nixos/machines}/default.nix (100%) rename {machines => nixos/machines}/jefke_host_ed25519-cert.pub (100%) rename {machines => nixos/machines}/jefke_user_ed25519-cert.pub (100%) rename {machines => nixos/machines}/lewis_host_ed25519-cert.pub (100%) rename {machines => nixos/machines}/lewis_user_ed25519-cert.pub (100%) rename {modules => nixos/modules}/custom/backups.nix (100%) rename {modules => nixos/modules}/custom/data-disk.nix (100%) rename {modules => nixos/modules}/custom/default.nix (100%) rename {modules => nixos/modules}/custom/disko.nix (100%) rename {modules => nixos/modules}/custom/k3s/bootstrap.nix (100%) rename {modules => nixos/modules}/custom/k3s/default.nix (100%) rename {modules => nixos/modules}/custom/ssh-certificates.nix (100%) rename {modules => nixos/modules}/custom/terraform-database.nix (100%) rename {modules => nixos/modules}/disk-config.nix (100%) rename postgresql_server.crt => nixos/postgresql_server.crt (100%) rename {secrets => nixos/secrets}/README.md (100%) rename {secrets => nixos/secrets}/atlas_host_ed25519.age (100%) rename {secrets => nixos/secrets}/atlas_user_ed25519.age (100%) rename {secrets => nixos/secrets}/jefke_host_ed25519.age (100%) rename {secrets => nixos/secrets}/jefke_user_ed25519.age (100%) rename {secrets => nixos/secrets}/lewis_host_ed25519.age (100%) rename {secrets => nixos/secrets}/lewis_user_ed25519.age (100%) rename {secrets => nixos/secrets}/postgresql_server.key.age (100%) rename {secrets => nixos/secrets}/secrets.nix (100%) diff --git a/flake.nix b/flake.nix index 97f1f47..68b8ee9 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; - machines = import ./machines; + machines = import ./nixos/machines; # TODO: Maybe use mergeAttrLists mkNixosSystems = systemDef: nixpkgs.lib.foldlAttrs @@ -70,7 +70,7 @@ machine.nixosModule disko.nixosModules.disko agenix.nixosModules.default - ./configuration.nix + ./nixos { networking.hostName = machine.name; } ]; }); diff --git a/configuration.nix b/nixos/default.nix similarity index 100% rename from configuration.nix rename to nixos/default.nix diff --git a/machines/atlas_host_ed25519-cert.pub b/nixos/machines/atlas_host_ed25519-cert.pub similarity index 100% rename from machines/atlas_host_ed25519-cert.pub rename to nixos/machines/atlas_host_ed25519-cert.pub diff --git a/machines/atlas_user_ed25519-cert.pub b/nixos/machines/atlas_user_ed25519-cert.pub similarity index 100% rename from machines/atlas_user_ed25519-cert.pub rename to nixos/machines/atlas_user_ed25519-cert.pub diff --git a/machines/default.nix b/nixos/machines/default.nix similarity index 100% rename from machines/default.nix rename to nixos/machines/default.nix diff --git a/machines/jefke_host_ed25519-cert.pub b/nixos/machines/jefke_host_ed25519-cert.pub similarity index 100% rename from machines/jefke_host_ed25519-cert.pub rename to nixos/machines/jefke_host_ed25519-cert.pub diff --git a/machines/jefke_user_ed25519-cert.pub b/nixos/machines/jefke_user_ed25519-cert.pub similarity index 100% rename from machines/jefke_user_ed25519-cert.pub rename to nixos/machines/jefke_user_ed25519-cert.pub diff --git a/machines/lewis_host_ed25519-cert.pub b/nixos/machines/lewis_host_ed25519-cert.pub similarity index 100% rename from machines/lewis_host_ed25519-cert.pub rename to nixos/machines/lewis_host_ed25519-cert.pub diff --git a/machines/lewis_user_ed25519-cert.pub b/nixos/machines/lewis_user_ed25519-cert.pub similarity index 100% rename from machines/lewis_user_ed25519-cert.pub rename to nixos/machines/lewis_user_ed25519-cert.pub diff --git a/modules/custom/backups.nix b/nixos/modules/custom/backups.nix similarity index 100% rename from modules/custom/backups.nix rename to nixos/modules/custom/backups.nix diff --git a/modules/custom/data-disk.nix b/nixos/modules/custom/data-disk.nix similarity index 100% rename from modules/custom/data-disk.nix rename to nixos/modules/custom/data-disk.nix diff --git a/modules/custom/default.nix b/nixos/modules/custom/default.nix similarity index 100% rename from modules/custom/default.nix rename to nixos/modules/custom/default.nix diff --git a/modules/custom/disko.nix b/nixos/modules/custom/disko.nix similarity index 100% rename from modules/custom/disko.nix rename to nixos/modules/custom/disko.nix diff --git a/modules/custom/k3s/bootstrap.nix b/nixos/modules/custom/k3s/bootstrap.nix similarity index 100% rename from modules/custom/k3s/bootstrap.nix rename to nixos/modules/custom/k3s/bootstrap.nix diff --git a/modules/custom/k3s/default.nix b/nixos/modules/custom/k3s/default.nix similarity index 100% rename from modules/custom/k3s/default.nix rename to nixos/modules/custom/k3s/default.nix diff --git a/modules/custom/ssh-certificates.nix b/nixos/modules/custom/ssh-certificates.nix similarity index 100% rename from modules/custom/ssh-certificates.nix rename to nixos/modules/custom/ssh-certificates.nix diff --git a/modules/custom/terraform-database.nix b/nixos/modules/custom/terraform-database.nix similarity index 100% rename from modules/custom/terraform-database.nix rename to nixos/modules/custom/terraform-database.nix diff --git a/modules/disk-config.nix b/nixos/modules/disk-config.nix similarity index 100% rename from modules/disk-config.nix rename to nixos/modules/disk-config.nix diff --git a/postgresql_server.crt b/nixos/postgresql_server.crt similarity index 100% rename from postgresql_server.crt rename to nixos/postgresql_server.crt diff --git a/secrets/README.md b/nixos/secrets/README.md similarity index 100% rename from secrets/README.md rename to nixos/secrets/README.md diff --git a/secrets/atlas_host_ed25519.age b/nixos/secrets/atlas_host_ed25519.age similarity index 100% rename from secrets/atlas_host_ed25519.age rename to nixos/secrets/atlas_host_ed25519.age diff --git a/secrets/atlas_user_ed25519.age b/nixos/secrets/atlas_user_ed25519.age similarity index 100% rename from secrets/atlas_user_ed25519.age rename to nixos/secrets/atlas_user_ed25519.age diff --git a/secrets/jefke_host_ed25519.age b/nixos/secrets/jefke_host_ed25519.age similarity index 100% rename from secrets/jefke_host_ed25519.age rename to nixos/secrets/jefke_host_ed25519.age diff --git a/secrets/jefke_user_ed25519.age b/nixos/secrets/jefke_user_ed25519.age similarity index 100% rename from secrets/jefke_user_ed25519.age rename to nixos/secrets/jefke_user_ed25519.age diff --git a/secrets/lewis_host_ed25519.age b/nixos/secrets/lewis_host_ed25519.age similarity index 100% rename from secrets/lewis_host_ed25519.age rename to nixos/secrets/lewis_host_ed25519.age diff --git a/secrets/lewis_user_ed25519.age b/nixos/secrets/lewis_user_ed25519.age similarity index 100% rename from secrets/lewis_user_ed25519.age rename to nixos/secrets/lewis_user_ed25519.age diff --git a/secrets/postgresql_server.key.age b/nixos/secrets/postgresql_server.key.age similarity index 100% rename from secrets/postgresql_server.key.age rename to nixos/secrets/postgresql_server.key.age diff --git a/secrets/secrets.nix b/nixos/secrets/secrets.nix similarity index 100% rename from secrets/secrets.nix rename to nixos/secrets/secrets.nix