diff --git a/modules/system/impermanence.nix b/modules/system/impermanence.nix index a8d2040..83e4438 100644 --- a/modules/system/impermanence.nix +++ b/modules/system/impermanence.nix @@ -33,6 +33,7 @@ in "/var/log" ] ++ config.custom.persist.directories; + files = [ "/etc/machine-id" "/etc/ssh/ssh_host_ed25519_key" diff --git a/modules/system/web-services/grafana.nix b/modules/system/web-services/grafana.nix index 7185158..8a0e92f 100644 --- a/modules/system/web-services/grafana.nix +++ b/modules/system/web-services/grafana.nix @@ -86,7 +86,7 @@ in datasources.settings = { prune = true; - datasources = + datasources = lib.concatLists [ (lib.optional cfg.datasources.prometheus.enable { name = "Prometheus"; type = "prometheus"; @@ -97,18 +97,19 @@ in prometheusVersion = "2.50.0"; }; }) - ++ (lib.optional cfg.datasources.victoriametrics.enable { + (lib.optional cfg.datasources.victoriametrics.enable { name = "VictoriaMetrics"; type = "victoriametrics-metrics-datasource"; inherit (cfg.datasources.victoriametrics) url; isDefault = false; }) - ++ (lib.optional cfg.datasources.victorialogs.enable { + (lib.optional cfg.datasources.victorialogs.enable { name = "VictoriaLogs"; type = "victoriametrics-logs-datasource"; inherit (cfg.datasources.victorialogs) url; isDefault = false; - }); + }) + ]; }; }; diff --git a/modules/system/web-services/memos.nix b/modules/system/web-services/memos.nix index a96792e..da0c726 100644 --- a/modules/system/web-services/memos.nix +++ b/modules/system/web-services/memos.nix @@ -29,9 +29,10 @@ in }; config = lib.mkIf cfg.enable { - warnings = - lib.optional (lib.pathExists "${modulesPath}/services/misc/memos.nix") "TODO: Use memos module from stable nixpkgs" - ++ lib.optional (lib.versionAtLeast lib.version "25.11") "TODO: Use memos package from stable nixpkgs"; + warnings = lib.concatLists [ + (lib.optional (lib.pathExists "${modulesPath}/services/misc/memos.nix") "TODO: Use memos module from stable nixpkgs") + (lib.optional (lib.versionAtLeast lib.version "25.11") "TODO: Use memos package from stable nixpkgs") + ]; meta = { domains.list = [ cfg.domain ];