From 8424d771f6bcd0045bed8badbeeac62f47014d4d Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Tue, 2 Dec 2025 08:34:57 +0100 Subject: [PATCH] feat(fw): update to 25.11 --- hosts/fw/channel | 2 +- hosts/fw/configuration.nix | 3 ++- hosts/fw/modules/web/n8n.nix | 22 ++++++++++------------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/hosts/fw/channel b/hosts/fw/channel index 93f5df5..57f31e7 100644 --- a/hosts/fw/channel +++ b/hosts/fw/channel @@ -1 +1 @@ -https://channels.nixos.org/nixos-25.05 +https://channels.nixos.org/nixos-25.11 diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix index 6a41e33..e3f8115 100644 --- a/hosts/fw/configuration.nix +++ b/hosts/fw/configuration.nix @@ -10,6 +10,7 @@ ./utils/modules/victoriametrics ./utils/modules/promtail ./utils/modules/borgbackup.nix + ./utils/modules/set-nix-channel.nix # fw ./modules/network-prefix.nix @@ -103,7 +104,7 @@ time.timeZone = "Europe/Vienna"; - services.logind.extraConfig = "RuntimeDirectorySize=2G"; + services.logind.settings.Login.RuntimeDirectorySize = "2G"; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.defaultSopsFile = ./secrets.yaml; diff --git a/hosts/fw/modules/web/n8n.nix b/hosts/fw/modules/web/n8n.nix index e1bd713..85f339e 100644 --- a/hosts/fw/modules/web/n8n.nix +++ b/hosts/fw/modules/web/n8n.nix @@ -19,21 +19,19 @@ }; # n8n service configuration - services.n8n = { - enable = true; - settings = { - database.type = "postgresdb"; - database.postgresdb.host = "/run/postgresql"; - database.postgresdb.database = "n8n"; - database.postgresdb.user = "n8n"; - executions.pruneData = true; - executions.pruneDataMaxAge = 168; # 7 days - }; - }; + services.n8n.enable = true; - # Configure git integration via environment variables + # Configure n8n via environment variables systemd.services.n8n = { environment = lib.mkForce { + # Database configuration (migrated from services.n8n.settings) + DB_TYPE = "postgresdb"; + DB_POSTGRESDB_HOST = "/run/postgresql"; + DB_POSTGRESDB_DATABASE = "n8n"; + DB_POSTGRESDB_USER = "n8n"; + EXECUTIONS_DATA_PRUNE = "true"; + EXECUTIONS_DATA_MAX_AGE = "168"; # 7 days + # Other settings N8N_ENCRYPTION_KEY = ""; # Will be set via environmentFile N8N_VERSION_NOTIFICATIONS_ENABLED = "false"; N8N_DIAGNOSTICS_ENABLED = "false";