From c5f43a8a37263d3aab94a7b7831a2f46006b8680 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 16 Jan 2024 00:17:28 +0100
Subject: [PATCH] colorschemes/nord: fix

---
 plugins/colorschemes/nord.nix                 | 100 +++++++++++++-----
 .../plugins/colorschemes/nord.nix             |  20 ++++
 2 files changed, 92 insertions(+), 28 deletions(-)
 create mode 100644 tests/test-sources/plugins/colorschemes/nord.nix

diff --git a/plugins/colorschemes/nord.nix b/plugins/colorschemes/nord.nix
index 76c1c2f3..0ce556f6 100644
--- a/plugins/colorschemes/nord.nix
+++ b/plugins/colorschemes/nord.nix
@@ -8,36 +8,72 @@
 with lib; let
   cfg = config.colorschemes.nord;
 in {
+  # Introduced January, 16 2024.
+  # TODO remove in early February 2023.
+  imports = let
+    basePluginPath = ["colorschemes" "nord"];
+  in [
+    (
+      mkRenamedOptionModule
+      (basePluginPath ++ ["disable_background"])
+      (basePluginPath ++ ["disableBackground"])
+    )
+    (
+      mkRenamedOptionModule
+      (basePluginPath ++ ["cursorline_transparent"])
+      (basePluginPath ++ ["cursorlineTransparent"])
+    )
+    (
+      mkRenamedOptionModule
+      (basePluginPath ++ ["enable_sidebar_background"])
+      (basePluginPath ++ ["enableSidebarBackground"])
+    )
+  ];
+
   options = {
     colorschemes.nord = {
       enable = mkEnableOption "nord";
 
-      package = helpers.mkPackageOption "nord.vim" pkgs.vimPlugins.nord-nvim;
+      package = helpers.mkPackageOption "nord.nvim" pkgs.vimPlugins.nord-nvim;
 
-      contrast =
-        mkEnableOption
-        "Make sidebars and popup menus like nvim-tree and telescope have a different background";
+      contrast = helpers.defaultNullOpts.mkBool false ''
+        Make sidebars and popup menus like nvim-tree and telescope have a different background.
+      '';
 
-      borders =
-        mkEnableOption
-        "Enable the border between verticaly split windows visable";
+      borders = helpers.defaultNullOpts.mkBool false ''
+        Enable the border between verticaly split windows visable.
+      '';
 
-      disable_background =
-        mkEnableOption
-        "Disable the setting of background color so that NeoVim can use your terminal background";
+      disableBackground = helpers.defaultNullOpts.mkBool false ''
+        Disable the setting of background color so that NeoVim can use your terminal background.
+      '';
 
-      cursorline_transparent =
-        mkEnableOption
-        "Set the cursorline transparent/visible";
+      cursorlineTransparent = helpers.defaultNullOpts.mkBool false ''
+        Set the cursorline transparent/visible.
+      '';
 
-      enable_sidebar_background =
-        mkEnableOption
-        "Re-enables the background of the sidebar if you disabled the background of everything";
+      enableSidebarBackground = helpers.defaultNullOpts.mkBool false ''
+        Re-enables the background of the sidebar if you disabled the background of everything.
+      '';
 
-      italic = mkOption {
-        description = "enables/disables italics";
-        type = types.nullOr types.bool;
-        default = null;
+      italic = helpers.defaultNullOpts.mkBool true ''
+        Enables/disables italics.
+      '';
+
+      uniformDiffBackground = helpers.defaultNullOpts.mkBool false ''
+        Enables/disables colorful backgrounds when used in _diff_ mode.
+      '';
+
+      extraConfig = mkOption {
+        type = types.attrs;
+        description = ''
+          The configuration options for vimtex without the 'nord_' prefix.
+          Example: To set 'nord_foo_bar' to 1, write
+            extraConfig = {
+              foo_bar = true;
+            };
+        '';
+        default = {};
       };
     };
   };
@@ -46,13 +82,21 @@ in {
     colorscheme = "nord";
     extraPlugins = [cfg.package];
 
-    globals = {
-      nord_contrast = mkIf cfg.contrast 1;
-      nord_borders = mkIf cfg.borders 1;
-      nord_disable_background = mkIf cfg.disable_background 1;
-      nord_cursoline_transparent = mkIf cfg.cursorline_transparent 1;
-      nord_enable_sidebar_background = mkIf cfg.enable_sidebar_background 1;
-      nord_italic = mkIf (cfg.italic != null) cfg.italic;
-    };
+    globals =
+      mapAttrs'
+      (name: value: nameValuePair "nord_${name}" value)
+      (with cfg;
+        {
+          inherit
+            contrast
+            borders
+            ;
+          disable_background = disableBackground;
+          cursorline_transparent = cursorlineTransparent;
+          enable_sidebar_background = enableSidebarBackground;
+          inherit italic;
+          uniform_diff_background = uniformDiffBackground;
+        }
+        // cfg.extraConfig);
   };
 }
diff --git a/tests/test-sources/plugins/colorschemes/nord.nix b/tests/test-sources/plugins/colorschemes/nord.nix
new file mode 100644
index 00000000..37b3c8b5
--- /dev/null
+++ b/tests/test-sources/plugins/colorschemes/nord.nix
@@ -0,0 +1,20 @@
+{
+  empty = {
+    colorschemes.nord.enable = true;
+  };
+
+  defaults = {
+    colorschemes.nord = {
+      enable = true;
+
+      contrast = false;
+      borders = false;
+      disableBackground = false;
+      cursorlineTransparent = false;
+      enableSidebarBackground = false;
+      italic = true;
+      uniformDiffBackground = false;
+      extraConfig = {};
+    };
+  };
+}