Merge pull request #203 from Donnerinoern/ui/colorizer

ui/colorizer: rebase on maintained fork

docs/release-notes/rl-0.6.md

@@ -20,6 +20,8 @@ Release notes for release 0.6
 
 - Fixed markdown preview with Glow not working and added an option for changing the preview keybind
 
+- colorizer.nvim: switched to a maintained fork
+
 [notashelf](https://github.com/notashelf):
 
 - Finished moving to `nixosOptionsDoc` in the documentation and changelog. We are fully free of asciidoc now

flake.lock

@@ -1063,15 +1063,15 @@
     "nvim-colorizer-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1591879145,
+        "lastModified": 1703321305,
-        "narHash": "sha256-6YrnItxExL2C8pNIdLd+hXCjsB2MbZANwWkah6dreD8=",
+        "narHash": "sha256-oKvFN2K+ASlPNwj2rhptR/ErYgo6XKBPhXSZotDdCP0=",
-        "owner": "norcalli",
+        "owner": "NvChad",
         "repo": "nvim-colorizer.lua",
-        "rev": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6",
+        "rev": "85855b38011114929f4058efc97af1059ab3e41d",
         "type": "github"
       },
       "original": {
-        "owner": "norcalli",
+        "owner": "NvChad",
         "repo": "nvim-colorizer.lua",
         "type": "github"
       }

flake.nix

@@ -520,7 +520,7 @@
     };
 
     nvim-colorizer-lua = {
-      url = "github:norcalli/nvim-colorizer.lua";
+      url = "github:NvChad/nvim-colorizer.lua";
       flake = false;
     };
 

modules/ui/colorizer/colorizer.nix

@@ -8,6 +8,15 @@ in {
   options.vim.ui.colorizer = {
     enable = mkEnableOption "nvim-colorizer.lua for color highlighting";
 
+    filetypes = mkOption {
+      type = with types; attrsOf attrs;
+      default = {
+        css = {};
+        scss = {};
+      };
+      description = "Filetypes to highlight on";
+    };
+
     options = {
       rgb = mkOption {
         type = types.bool;
@@ -47,7 +56,7 @@ in {
 
       css = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = "Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB";
       };
 
@@ -62,6 +71,24 @@ in {
         default = "background";
         description = "Set the display mode";
       };
+
+      tailwind = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable tailwind colors";
+      };
+
+      sass = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable sass colors";
+      };
+
+      alwaysUpdate = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Update color values even if buffer is not focused, like when using cmp_menu, cmp_docs";
+      };
     };
   };
 }

modules/ui/colorizer/config.nix

@@ -15,7 +15,8 @@ in {
 
     vim.luaConfigRC.colorizer = nvim.dag.entryAnywhere ''
       require('colorizer').setup({
-         DEFAULT_OPTIONS = {
+        filetypes = ${nvim.lua.attrsetToLuaTable cfg.filetypes},
+        user_default_options = {
           RGB           = ${boolToString cfg.options.rgb};
           RRGGBB        = ${boolToString cfg.options.rrggbb};
           names         = ${boolToString cfg.options.names};
@@ -25,6 +26,9 @@ in {
           css           = ${boolToString cfg.options.css};
           css_fn        = ${boolToString cfg.options.css_fn};
           mode          = '${toString cfg.options.mode}';
+          tailwind      = ${boolToString cfg.options.tailwind};
+          sass          = ${boolToString cfg.options.tailwind};
+          always_update = ${boolToString cfg.options.alwaysUpdate};
         }
       })
     '';