From 2cec6178abacc864c5988c99527d0fbb0c003b26 Mon Sep 17 00:00:00 2001
From: Pei Yang Ching <pei.ching@check24.de>
Date: Sun, 5 May 2024 02:16:12 +0200
Subject: [PATCH] colorizer: revert setupOpts name changes

---
 modules/plugins/ui/colorizer/colorizer.nix | 11 ++++++-----
 modules/plugins/ui/colorizer/config.nix    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/plugins/ui/colorizer/colorizer.nix b/modules/plugins/ui/colorizer/colorizer.nix
index bbbad37..084f91d 100644
--- a/modules/plugins/ui/colorizer/colorizer.nix
+++ b/modules/plugins/ui/colorizer/colorizer.nix
@@ -27,23 +27,24 @@
   };
 in {
   imports = [
-    (mkRenamedOptionModule ["vim" "ui" "colorizer" "options"] ["vim" "ui" "colorizer" "setupOpts" "defaultOptions"])
-    (mkRenamedOptionModule ["vim" "ui" "colorizer" "filetypes"] ["vim" "ui" "colorizer" "setupOpts" "filetypes"])
+    (mkRenamedOptionModule ["vim" "ui" "colorizer" "setupOpts" "defaultOptions"] ["vim" "ui" "colorizer" "options"])
+    (mkRenamedOptionModule ["vim" "ui" "colorizer" "setupOpts" "filetypes"] ["vim" "ui" "colorizer" "filetypes"])
   ];
 
   options.vim.ui.colorizer = {
     enable = mkEnableOption "color highlighting [nvim-colorizer.lua]";
 
-    defaultOptions = mkOption {
+    #  colorizer has a non-standard setup function (takes two args), so we're not using setupOpts
+    options = mkOption {
       description = ''
         Default options that apply to all filetypes. Filetype specific settings from
-        [filetypeSettings](#opt-vim.ui.colorizer.filetypeSettings) take precedence.
+        [filetypes](#opt-vim.ui.colorizer.filetypes) take precedence.
       '';
       default = {};
       type = settingSubmodule;
     };
 
-    filetypeOptions = mkOption {
+    filetypes = mkOption {
       description = "Filetype specific settings";
       default = {};
       type = submodule {
diff --git a/modules/plugins/ui/colorizer/config.nix b/modules/plugins/ui/colorizer/config.nix
index d96920d..7adace2 100644
--- a/modules/plugins/ui/colorizer/config.nix
+++ b/modules/plugins/ui/colorizer/config.nix
@@ -15,7 +15,7 @@ in {
     ];
 
     vim.luaConfigRC.colorizer = entryAnywhere ''
-      require('colorizer').setup(${toLuaObject cfg.filetypeOptions}, ${toLuaObject cfg.defaultOptions})
+      require('colorizer').setup(${toLuaObject cfg.filetypes}, ${toLuaObject cfg.options})
     '';
   };
 }