From 00f4c09191f2a2dbcbe8bb37104c6dc458223a83 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Thu, 8 Feb 2024 08:36:14 -0800 Subject: [PATCH] fix(ct): dynamic hostname --- lib.nix | 2 +- packages/default.nix | 2 +- systems/ct/nixos.nix | 5 ++++- tf/proxmox_vms.tf | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib.nix b/lib.nix index f9870c1d..226f4829 100644 --- a/lib.nix +++ b/lib.nix @@ -29,7 +29,7 @@ nibble0 + (fixedWidthString 1 "0" (toHexStringLower nibble1)); in "${part0 (part 0)}${part 1}:${part 2}ff:fe${part 3}:${part 4}${part 5}"; in { - inherit tree nixlib; + inherit tree nixlib inputs; std = inputs.self.lib.Std.Std.compat; Std = inputs.std-fl.lib; lib = { diff --git a/packages/default.nix b/packages/default.nix index 47c27df3..8d67ec20 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -126,7 +126,7 @@ "''${NF_CONFIG_ROOT-${toString ../.}}#$ARG_CONFIG_PATH.system.build.tarball" \ --show-trace "$@") if [[ $ARG_NODE = ct ]]; then - DATESTAMP=$(nix eval --raw "''${NF_CONFIG_ROOT-${toString ../.}}#inputs.nixpkgs.sourceInfo.lastModifiedDate") + DATESTAMP=$(nix eval --raw "''${NF_CONFIG_ROOT-${toString ../.}}#lib.inputs.nixpkgs.sourceInfo.lastModifiedDate") DATENAME=''${DATESTAMP:0:4}''${DATESTAMP:4:2}''${DATESTAMP:6:2} SYSARCH=$(nix eval --raw "''${NF_CONFIG_ROOT-${toString ../.}}#$ARG_CONFIG_PATH.nixpkgs.system") TAREXT=$(nix eval --raw "''${NF_CONFIG_ROOT-${toString ../.}}#$ARG_CONFIG_PATH.system.build.tarball.extension") diff --git a/systems/ct/nixos.nix b/systems/ct/nixos.nix index 7b2790e2..8c79d7ad 100644 --- a/systems/ct/nixos.nix +++ b/systems/ct/nixos.nix @@ -1,11 +1,14 @@ { meta, - lib, ... }: { imports = with meta; [ nixos.reisen-ct ]; + # allow proxmox to provide us with our hostname + environment.etc.hostname.enable = false; + services.avahi.hostName = ""; + system.stateVersion = "23.11"; } diff --git a/tf/proxmox_vms.tf b/tf/proxmox_vms.tf index 38d77d77..892ab5f1 100644 --- a/tf/proxmox_vms.tf +++ b/tf/proxmox_vms.tf @@ -1,6 +1,6 @@ variable "proxmox_container_template" { type = string - default = "local:vztmpl/ct-20240127-nixos-system-x86_64-linux.tar.xz" + default = "local:vztmpl/ct-20240205-nixos-system-x86_64-linux.tar.xz" } locals {