diff --git a/flake.lock b/flake.lock index b4cbd30..3866803 100644 --- a/flake.lock +++ b/flake.lock @@ -405,11 +405,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1703273523, - "narHash": "sha256-YG/KXGLR4wkiJidX8MtunXOlSsR8tgqwkfQnS3Xe1Jk=", + "lastModified": 1703274528, + "narHash": "sha256-r5y1DmRxlKF3rlJoIULeq1lGVGWbTZxmNGlQ0jW8ZjQ=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "5072dd354d2dd3bfead36c9269c34ed00d0f3fdd", + "rev": "f4a871a401059ff0662ef86a059742d47d45a5bc", "type": "github" }, "original": { diff --git a/hosts/sentinel/secrets/local.nix.age b/hosts/sentinel/secrets/local.nix.age index acf8c42..16aa17f 100644 Binary files a/hosts/sentinel/secrets/local.nix.age and b/hosts/sentinel/secrets/local.nix.age differ diff --git a/modules/guests/microvm.nix b/modules/guests/microvm.nix index 25aa2d9..b7b7d74 100644 --- a/modules/guests/microvm.nix +++ b/modules/guests/microvm.nix @@ -71,7 +71,7 @@ in { _: zfsCfg: { source = zfsCfg.hostMountpoint; mountPoint = zfsCfg.guestMountpoint; - tag = lib.replaceStrings ["/"] ["_"] zfsCfg.hostMountpoint; + tag = builtins.substring 0 16 (builtins.hashString "sha256" zfsCfg.hostMountpoint); proto = "virtiofs"; } ); diff --git a/modules/promtail.nix b/modules/promtail.nix index fee1072..6a4deab 100644 --- a/modules/promtail.nix +++ b/modules/promtail.nix @@ -1,6 +1,7 @@ { config, lib, + minimal, nodes, ... }: let @@ -23,7 +24,7 @@ in { }; }; - config = mkIf cfg.enable { + config = mkIf (!minimal && cfg.enable) { age.secrets.promtail-loki-basic-auth-password = { generator.script = "alnum"; mode = "440"; diff --git a/modules/telegraf.nix b/modules/telegraf.nix index cb4271e..eccc9ad 100644 --- a/modules/telegraf.nix +++ b/modules/telegraf.nix @@ -1,6 +1,7 @@ { config, lib, + minimal, nodes, pkgs, ... @@ -56,7 +57,7 @@ in { }; }; - config = mkIf cfg.enable { + config = mkIf (!minimal && cfg.enable) { nodes.${cfg.influxdb2.node} = { # Mirror the original secret on the influx host age.secrets."telegraf-influxdb-token-${config.node.name}" = { diff --git a/nix/generate-installer-package.nix b/nix/generate-installer-package.nix index 8158990..30c5efd 100644 --- a/nix/generate-installer-package.nix +++ b/nix/generate-installer-package.nix @@ -20,7 +20,7 @@ installer-package = pkgs.symlinkJoin { name = "installer-package-${nodeName}"; - paths = with pkgs; [ + paths = [ disko-script disko-mount disko-format