Merge pull request #851 from howird/main

languages/python: fix python dap configuration regression

docs/release-notes/rl-0.8.md

@@ -340,7 +340,12 @@
 - Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
 - Add necessary dependency of `flutter-tools.nvim` on lsp.
 - Add the `vim.languages.dart.flutter-tools.flutterPackage` option.
+- Fix the type of the `highlight` color options.
 
 [howird](https://github.com/howird):
 
 - Change python dap adapter name from `python` to commonly expected `debugpy`.
+
+[aionoid](https://github.com/aionoid):
+
+- Fix [render-markdown.nvim] file_types option type to list, to accept merging.

modules/neovim/init/highlight.nix

@@ -5,15 +5,14 @@
 }: let
   inherit (lib.options) mkOption;
   inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum;
-  inherit (lib.strings) hasPrefix concatLines;
+  inherit (lib.strings) concatLines;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.nvim.dag) entryBetween;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.types) hexColor;
 
   mkColorOption = target:
     mkOption {
-      type = nullOr hexColor;
+      type = nullOr str;
       default = null;
       example = "#ebdbb2";
       description = ''

modules/plugins/languages/markdown.nix

@@ -9,7 +9,7 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.lists) isList;
-  inherit (lib.types) bool enum either package listOf str;
+  inherit (lib.types) bool enum either package listOf str nullOr;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
@@ -117,7 +117,18 @@ in {
             '';
           };
 
-        setupOpts = mkPluginSetupOption "render-markdown" {};
+        setupOpts = mkPluginSetupOption "render-markdown" {
+          file_types = lib.mkOption {
+            type = nullOr (listOf str);
+            default = null;
+            description = ''
+              List of buffer filetypes to enable this plugin in.
+
+              This will cause the plugin to attach to new buffers who
+              have any of these filetypes.
+            '';
+          };
+        };
       };
     };
 

modules/plugins/languages/python.nix

@@ -125,7 +125,7 @@
           end
         end
 
-        dap.configurations.debugpy = {
+        dap.configurations.python = {
           {
             -- The first three options are required by nvim-dap
             type = 'debugpy'; -- the type here established the link to the adapter definition: `dap.adapters.debugpy`

modules/plugins/mini/cursorword/config.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.mini.cursorword;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-cursorword"];
+
+    pluginRC.mini-ai = entryAnywhere ''
+      require("mini.cursorword").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}

modules/plugins/mini/cursorword/cursorword.nix

@@ -0,0 +1,9 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.cursorword = {
+    enable = mkEnableOption "mini.cursorword";
+    setupOpts = mkPluginSetupOption "mini.cursorword" {};
+  };
+}

modules/plugins/mini/cursorword/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./cursorword.nix
+    ./config.nix
+  ];
+}

modules/plugins/mini/default.nix

@@ -11,6 +11,7 @@
     ./colors
     ./comment
     ./completion
+    ./cursorword
     ./diff
     ./doc
     ./extra

npins/sources.json

@@ -1020,6 +1020,22 @@
       "url": "https://github.com/echasnovski/mini.completion/archive/35130cebc63ace7d6e4583f349af8cd3f3141af7.tar.gz",
       "hash": "0h5z5i62cc780bzw60rbizngvpyl4vk7j858pndyi2g572plz929"
     },
+    "mini-cursorword": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.cursorword"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "submodules": false,
+      "version": "v0.15.0",
+      "revision": "6683f04509c380e3147cca368f90bbdb99641775",
+      "url": "https://api.github.com/repos/echasnovski/mini.cursorword/tarball/v0.15.0",
+      "hash": "0vqr4hkzq13ap6giyyp8asn5g6nnm406piq1a07a5nmkfxiskp9v"
+    },
     "mini-diff": {
       "type": "Git",
       "repository": {