diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 4e14e07..58a83e1 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -31,11 +31,7 @@ }; nixpkgs = inputs.nixpkgs; nixos.module = { - imports = [ - ./vm02179/configuration.nix - ./vm02179/hardware-configuration.nix - ./vm02179/gitea-runner.nix - ]; + imports = [ ./vm02179 ]; }; }; diff --git a/infra/vm02179/configuration.nix b/infra/vm02179/configuration.nix deleted file mode 100644 index 1974593..0000000 --- a/infra/vm02179/configuration.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ ../common ]; - - procolix.vm = { - name = "vm02179"; - ip4 = "185.206.232.179"; - ip6 = "2a00:51c0:12:1201::179"; - }; -} diff --git a/infra/vm02179/hardware-configuration.nix b/infra/vm02179/default.nix similarity index 62% rename from infra/vm02179/hardware-configuration.nix rename to infra/vm02179/default.nix index 5b89888..f5065ee 100644 --- a/infra/vm02179/hardware-configuration.nix +++ b/infra/vm02179/default.nix @@ -1,4 +1,15 @@ { + imports = [ + ../common + ./gitea-runner.nix + ]; + + procolix.vm = { + name = "vm02179"; + ip4 = "185.206.232.179"; + ip6 = "2a00:51c0:12:1201::179"; + }; + fileSystems."/" = { device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241"; fsType = "ext4";