Compare commits

..

No commits in common. "9f6413e891c02168e954f0e29ed56ff59fd09d16" and "e21904d50d53f0da8242b2d0699e1c5938649c07" have entirely different histories.

13 changed files with 6 additions and 109 deletions

View file

@ -337,13 +337,9 @@
[Noah765](https://github.com/Noah765):
[vim-sleuth]: https://github.com/tpope/vim-sleuth
- 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.
- Add [vim-sleuth] plugin under `vim.utility.sleuth`.
[howird](https://github.com/howird):
@ -353,5 +349,4 @@
[avante-nvim]: https://github.com/yetone/avante.nvim
- Fix [render-markdown.nvim] file_types option type to list, to accept merging.
- Add [avante.nvim] plugin under `vim.assistant.avante-nvim`.

View file

@ -5,14 +5,15 @@
}: let
inherit (lib.options) mkOption;
inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum;
inherit (lib.strings) concatLines;
inherit (lib.strings) hasPrefix 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 str;
type = nullOr hexColor;
default = null;
example = "#ebdbb2";
description = ''

View file

@ -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 nullOr;
inherit (lib.types) bool enum either package listOf str;
inherit (lib.nvim.lua) expToLua toLuaObject;
inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption;
inherit (lib.nvim.dag) entryAnywhere;
@ -117,18 +117,7 @@ in {
'';
};
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.
'';
};
};
setupOpts = mkPluginSetupOption "render-markdown" {};
};
};

View file

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

View file

@ -1,19 +0,0 @@
{
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})
'';
};
}

View file

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

View file

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

View file

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

View file

@ -18,7 +18,6 @@
./oil-nvim
./outline
./preview
./sleuth
./snacks-nvim
./surround
./telescope

View file

@ -1,10 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib.modules) mkIf;
cfg = config.vim.utility.sleuth;
in {
vim.startPlugins = mkIf cfg.enable ["vim-sleuth"];
}

View file

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

View file

@ -1,7 +0,0 @@
{lib, ...}: let
inherit (lib.options) mkEnableOption;
in {
options.vim.utility.sleuth.enable = mkEnableOption ''
automatically adjusting options such as `shiftwidth` or `expandtab`, using `vim-sleuth`
'';
}

View file

@ -1033,22 +1033,6 @@
"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": {
@ -2420,19 +2404,6 @@
"url": "https://github.com/tpope/vim-repeat/archive/65846025c15494983dafe5e3b46c8f88ab2e9635.tar.gz",
"hash": "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv"
},
"vim-sleuth": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "tpope",
"repo": "vim-sleuth"
},
"branch": "master",
"submodules": false,
"revision": "be69bff86754b1aa5adcbb527d7fcd1635a84080",
"url": "https://github.com/tpope/vim-sleuth/archive/be69bff86754b1aa5adcbb527d7fcd1635a84080.tar.gz",
"hash": "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq"
},
"vim-startify": {
"type": "Git",
"repository": {