From 6edbfa0b42d337177edb1c4b4264de3860a75602 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Tue, 21 Oct 2025 20:30:49 +0200 Subject: [PATCH] Assert todos instead of warn --- modules/system/dm/tuigreet.nix | 7 ++++--- modules/system/web-services/filebrowser.nix | 6 ++++-- modules/system/web-services/forgejo/default.nix | 8 +++++--- modules/system/web-services/gatus.nix | 5 ++++- modules/system/web-services/memos.nix | 12 +++++++++--- modules/system/web-services/privatebin.nix | 5 ++++- modules/system/web-services/victorialogs.nix | 5 ++++- modules/system/web-services/victoriametrics.nix | 5 ++++- 8 files changed, 38 insertions(+), 15 deletions(-) diff --git a/modules/system/dm/tuigreet.nix b/modules/system/dm/tuigreet.nix index d1d74cd..e29f3d3 100644 --- a/modules/system/dm/tuigreet.nix +++ b/modules/system/dm/tuigreet.nix @@ -14,9 +14,10 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional ( - config.services.greetd ? useTextGreeter - ) "TODO: Replace tuigreet tty fix with `useTextGreeter` option"; + assertions = lib.singleton { + assertion = !config.services.greetd ? useTextGreeter; + message = "TODO: Replace tuigreet tty fix with `useTextGreeter` option"; + }; services.greetd = { enable = true; diff --git a/modules/system/web-services/filebrowser.nix b/modules/system/web-services/filebrowser.nix index cdf35d2..1dcd009 100644 --- a/modules/system/web-services/filebrowser.nix +++ b/modules/system/web-services/filebrowser.nix @@ -33,10 +33,12 @@ in assertion = lib'.isTailscaleDomain cfg.domain; message = "Filebrowser isn't yet configured with access controll."; } + { + assertion = !lib.pathExists "${modulesPath}/services/web-apps/filebrowser.nix"; + message = "TODO: Use filebrowser module from stable nixpkgs"; + } ]; - warnings = lib.optional (lib.pathExists "${modulesPath}/services/web-apps/filebrowser.nix") "TODO: Use filebrowser module from stable nixpkgs"; - meta = { domains.list = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; diff --git a/modules/system/web-services/forgejo/default.nix b/modules/system/web-services/forgejo/default.nix index d26b3ef..209ef24 100644 --- a/modules/system/web-services/forgejo/default.nix +++ b/modules/system/web-services/forgejo/default.nix @@ -25,9 +25,11 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional ( - (lib.versionAtLeast pkgs.forgejo.version pinnedVersion) && (pkgs.forgejo.version != pinnedVersion) - ) "TODO: Use forgejo package from stable nixpkgs"; + assertions = lib.singleton { + assertion = + (lib.versionOlder pkgs.forgejo.version pinnedVersion) || (pkgs.forgejo.version == pinnedVersion); + message = "TODO: Use forgejo package from stable nixpkgs"; + }; meta = { domains.list = [ cfg.domain ]; diff --git a/modules/system/web-services/gatus.nix b/modules/system/web-services/gatus.nix index f161446..28805f4 100644 --- a/modules/system/web-services/gatus.nix +++ b/modules/system/web-services/gatus.nix @@ -68,7 +68,10 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional (lib.versionAtLeast lib.version "25.11") "TODO: Use gatus package from stable nixpkgs"; + assertions = lib.singleton { + assertion = lib.versionOlder lib.version "25.11"; + message = "TODO: Use gatus package from stable nixpkgs"; + }; meta = { domains.list = [ cfg.domain ]; diff --git a/modules/system/web-services/memos.nix b/modules/system/web-services/memos.nix index da0c726..621f37f 100644 --- a/modules/system/web-services/memos.nix +++ b/modules/system/web-services/memos.nix @@ -29,9 +29,15 @@ in }; config = lib.mkIf cfg.enable { - 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") + assertions = [ + { + assertion = !lib.pathExists "${modulesPath}/services/misc/memos.nix"; + message = "TODO: Use memos module from stable nixpkgs"; + } + { + assertion = lib.versionOlder lib.version "25.11"; + message = "TODO: Use memos package from stable nixpkgs"; + } ]; meta = { diff --git a/modules/system/web-services/privatebin.nix b/modules/system/web-services/privatebin.nix index 864f13d..ca2e90c 100644 --- a/modules/system/web-services/privatebin.nix +++ b/modules/system/web-services/privatebin.nix @@ -25,7 +25,10 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional (lib.versionAtLeast lib.version "25.11") "TODO: Use privatebin package from stable nixpkgs"; + assertions = lib.singleton { + assertion = lib.versionOlder lib.version "25.11"; + message = "TODO: Use privatebin package from stable nixpkgs"; + }; meta = { domains.list = [ cfg.domain ]; diff --git a/modules/system/web-services/victorialogs.nix b/modules/system/web-services/victorialogs.nix index f961d3e..4de3498 100644 --- a/modules/system/web-services/victorialogs.nix +++ b/modules/system/web-services/victorialogs.nix @@ -25,7 +25,10 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional (lib.versionAtLeast lib.version "25.11") "TODO: Use victorialogs package from stable nixpkgs"; + assertions = lib.singleton { + assertion = lib.versionOlder lib.version "25.11"; + message = "TODO: Use victorialogs package from stable nixpkgs"; + }; meta = { domains.list = [ cfg.domain ]; diff --git a/modules/system/web-services/victoriametrics.nix b/modules/system/web-services/victoriametrics.nix index 75d26a7..e64232b 100644 --- a/modules/system/web-services/victoriametrics.nix +++ b/modules/system/web-services/victoriametrics.nix @@ -21,7 +21,10 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional (lib.versionAtLeast lib.version "25.11") "TODO: Use victoriametrics package from stable nixpkgs"; + assertions = lib.singleton { + assertion = lib.versionOlder lib.version "25.11"; + message = "TODO: Use victoriametrics package from stable nixpkgs"; + }; meta = { domains.list = [ cfg.domain ];