From 0aaa8960cb147a46af8036893d84252b5dfa0f4c Mon Sep 17 00:00:00 2001
From: Anton Tetov <anton@tetov.se>
Date: Tue, 1 Jul 2025 11:53:54 +0200
Subject: [PATCH] nixos/vim: assert that both enable and defaultEditor is set

---
 nixos/modules/programs/vim.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix
index 80dc3cdd3959..c3efcd0a54dc 100644
--- a/nixos/modules/programs/vim.nix
+++ b/nixos/modules/programs/vim.nix
@@ -17,10 +17,12 @@ in
     package = lib.mkPackageOption pkgs "vim" { example = [ "vim-full" ]; };
   };
 
-  # TODO: convert it into assert after 24.11 release
   config = lib.mkIf (cfg.enable || cfg.defaultEditor) {
-    warnings = lib.mkIf (cfg.defaultEditor && !cfg.enable) [
-      "programs.vim.defaultEditor will only work if programs.vim.enable is enabled, which will be enforced after the 24.11 release"
+    assertions = [
+      {
+        assertion = cfg.defaultEditor -> cfg.enable;
+        message = "{option}`programs.vim.defaultEditor` requires {option}`programs.vim.enable` to be set to true.";
+      }
     ];
     environment = {
       systemPackages = [ cfg.package ];