From 9c85431a2226adfa27fb432f88857fe48ac0ffeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Fri, 31 Jan 2025 15:22:28 +0100 Subject: [PATCH] Move everything into `common` with better names --- infra/common/{ => nixosConfiguration}/default.nix | 0 infra/common/{ => nixosConfiguration}/hardware.nix | 0 infra/common/{ => nixosConfiguration}/networking.nix | 0 infra/common/{ => nixosConfiguration}/nftables-ruleset.nft | 0 infra/common/{ => nixosConfiguration}/users.nix | 0 infra/{ => common}/procolixResource.nix | 2 +- infra/flake-part.nix | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) rename infra/common/{ => nixosConfiguration}/default.nix (100%) rename infra/common/{ => nixosConfiguration}/hardware.nix (100%) rename infra/common/{ => nixosConfiguration}/networking.nix (100%) rename infra/common/{ => nixosConfiguration}/nftables-ruleset.nft (100%) rename infra/common/{ => nixosConfiguration}/users.nix (100%) rename infra/{ => common}/procolixResource.nix (96%) diff --git a/infra/common/default.nix b/infra/common/nixosConfiguration/default.nix similarity index 100% rename from infra/common/default.nix rename to infra/common/nixosConfiguration/default.nix diff --git a/infra/common/hardware.nix b/infra/common/nixosConfiguration/hardware.nix similarity index 100% rename from infra/common/hardware.nix rename to infra/common/nixosConfiguration/hardware.nix diff --git a/infra/common/networking.nix b/infra/common/nixosConfiguration/networking.nix similarity index 100% rename from infra/common/networking.nix rename to infra/common/nixosConfiguration/networking.nix diff --git a/infra/common/nftables-ruleset.nft b/infra/common/nixosConfiguration/nftables-ruleset.nft similarity index 100% rename from infra/common/nftables-ruleset.nft rename to infra/common/nixosConfiguration/nftables-ruleset.nft diff --git a/infra/common/users.nix b/infra/common/nixosConfiguration/users.nix similarity index 100% rename from infra/common/users.nix rename to infra/common/nixosConfiguration/users.nix diff --git a/infra/procolixResource.nix b/infra/common/procolixResource.nix similarity index 96% rename from infra/procolixResource.nix rename to infra/common/procolixResource.nix index ab665547..d0ef2bac 100644 --- a/infra/procolixResource.nix +++ b/infra/common/procolixResource.nix @@ -32,7 +32,7 @@ in nixos.module = { imports = [ - ./common + ./nixosConfiguration self.nixosModules.ageSecrets ]; diff --git a/infra/flake-part.nix b/infra/flake-part.nix index c588b529..7b24500d 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -16,7 +16,7 @@ let _module.args = { inherit self inputs providers; }; imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos - ./procolixResource.nix + ./common/procolixResource.nix (./. + "/${vmName}") ]; procolixVm.name = vmName;