From 11df0d6c9e3fef9b1e8c9a2ac3ba878dcb0a6975 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 2 Jul 2024 19:57:25 +0100 Subject: [PATCH] modules: use assertions module from nixpkgs It is essentially identical to our `warnings` module. --- modules/default.nix | 1 - modules/misc/default.nix | 1 + modules/warnings.nix | 16 ---------------- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 modules/warnings.nix diff --git a/modules/default.nix b/modules/default.nix index e78fd468..84420920 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -15,6 +15,5 @@ ./opts.nix ./output.nix ./plugins.nix - ./warnings.nix ]; } diff --git a/modules/misc/default.nix b/modules/misc/default.nix index a63903da..ede3a061 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -8,6 +8,7 @@ in imports = [ ./nixpkgs.nix ./nixvim-info.nix + (nixosModules + "/misc/assertions.nix") (nixosModules + "/misc/meta.nix") ]; } diff --git a/modules/warnings.nix b/modules/warnings.nix deleted file mode 100644 index 7a25303a..00000000 --- a/modules/warnings.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, ... }: -with lib; -{ - options = { - warnings = mkOption { - type = types.listOf types.str; - visible = false; - default = [ ]; - }; - assertions = mkOption { - type = types.listOf types.attrs; # Not sure what the correct type is here - visible = false; - default = [ ]; - }; - }; -}