mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-09-06 02:11:33 +00:00
Merge branch 'main' into notashelf/push-nprwpvxsxrmv
This commit is contained in:
commit
d5d4cdeb2f
9 changed files with 45 additions and 4 deletions
|
@ -43,7 +43,7 @@ isMaximal: {
|
||||||
# This section does not include a comprehensive list of available language modules.
|
# This section does not include a comprehensive list of available language modules.
|
||||||
# To list all available language module options, please visit the nvf manual.
|
# To list all available language module options, please visit the nvf manual.
|
||||||
languages = {
|
languages = {
|
||||||
enableFormat = true; #
|
enableFormat = true;
|
||||||
enableTreesitter = true;
|
enableTreesitter = true;
|
||||||
enableExtraDiagnostics = true;
|
enableExtraDiagnostics = true;
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ isMaximal: {
|
||||||
leetcode-nvim.enable = isMaximal;
|
leetcode-nvim.enable = isMaximal;
|
||||||
multicursors.enable = isMaximal;
|
multicursors.enable = isMaximal;
|
||||||
smart-splits.enable = isMaximal;
|
smart-splits.enable = isMaximal;
|
||||||
|
undotree.enable = isMaximal;
|
||||||
motion = {
|
motion = {
|
||||||
hop.enable = true;
|
hop.enable = true;
|
||||||
leap.enable = true;
|
leap.enable = true;
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
[snacks.nvim]: https://github.com/folke/snacks.nvim
|
[snacks.nvim]: https://github.com/folke/snacks.nvim
|
||||||
[oil.nvim]: https://github.com/stevearc/oil.nvim
|
[oil.nvim]: https://github.com/stevearc/oil.nvim
|
||||||
[hunk.nvim]: https://github.com/julienvincent/hunk.nvim
|
[hunk.nvim]: https://github.com/julienvincent/hunk.nvim
|
||||||
|
[undotree]: https://github.com/mbbill/undotree
|
||||||
|
|
||||||
- Add [typst-preview.nvim] under
|
- Add [typst-preview.nvim] under
|
||||||
`languages.typst.extensions.typst-preview-nvim`.
|
`languages.typst.extensions.typst-preview-nvim`.
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
cmd = ${
|
cmd = ${
|
||||||
if isList cfg.lsp.package
|
if isList cfg.lsp.package
|
||||||
then expToLua cfg.lsp.package
|
then expToLua cfg.lsp.package
|
||||||
else "{'${cfg.lsp.package}/bin/wgsl_analyzer'}"
|
else "{'${cfg.lsp.package}/bin/wgsl-analyzer'}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -25,7 +25,7 @@ in {
|
||||||
type = listOf package;
|
type = listOf package;
|
||||||
default = [];
|
default = [];
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
||||||
regex
|
regex
|
||||||
kdl
|
kdl
|
||||||
];
|
];
|
||||||
|
@ -33,6 +33,7 @@ in {
|
||||||
description = ''
|
description = ''
|
||||||
List of treesitter grammars to install. For grammars to be installed properly,
|
List of treesitter grammars to install. For grammars to be installed properly,
|
||||||
you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
|
you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
|
||||||
|
You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars.
|
||||||
|
|
||||||
For languages already supported by nvf, you may use
|
For languages already supported by nvf, you may use
|
||||||
{option}`vim.language.<lang>.treesitter` options, which will automatically add
|
{option}`vim.language.<lang>.treesitter` options, which will automatically add
|
||||||
|
|
|
@ -26,5 +26,6 @@
|
||||||
./wakatime
|
./wakatime
|
||||||
./yanky-nvim
|
./yanky-nvim
|
||||||
./yazi-nvim
|
./yazi-nvim
|
||||||
|
./undotree
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
12
modules/plugins/utility/undotree/config.nix
Normal file
12
modules/plugins/utility/undotree/config.nix
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
vim.lazy.plugins.undotree = {
|
||||||
|
package = "undotree";
|
||||||
|
cmd = [
|
||||||
|
"UndotreeToggle"
|
||||||
|
"UndotreeShow"
|
||||||
|
"UndotreeHide"
|
||||||
|
"UndotreePersistUndo"
|
||||||
|
"UndotreeFocus"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
6
modules/plugins/utility/undotree/default.nix
Normal file
6
modules/plugins/utility/undotree/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./undotree.nix
|
||||||
|
./config.nix
|
||||||
|
];
|
||||||
|
}
|
7
modules/plugins/utility/undotree/undotree.nix
Normal file
7
modules/plugins/utility/undotree/undotree.nix
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{lib, ...}: let
|
||||||
|
inherit (lib.options) mkEnableOption;
|
||||||
|
in {
|
||||||
|
options.vim.utility.undotree = {
|
||||||
|
enable = mkEnableOption "undo history visualizer for Vim [undotree]";
|
||||||
|
};
|
||||||
|
}
|
|
@ -2497,6 +2497,19 @@
|
||||||
"url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz",
|
"url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz",
|
||||||
"hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"
|
"hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"
|
||||||
},
|
},
|
||||||
|
"undotree": {
|
||||||
|
"type": "Git",
|
||||||
|
"repository": {
|
||||||
|
"type": "GitHub",
|
||||||
|
"owner": "mbbill",
|
||||||
|
"repo": "undotree"
|
||||||
|
},
|
||||||
|
"branch": "master",
|
||||||
|
"submodules": false,
|
||||||
|
"revision": "28f2f54a34baff90ea6f4a735ef1813ad875c743",
|
||||||
|
"url": "https://github.com/mbbill/undotree/archive/28f2f54a34baff90ea6f4a735ef1813ad875c743.tar.gz",
|
||||||
|
"hash": "0k9qfp64rbwy1lc62x0vkwfl3qlx8633lfbhqxkf64yqwi81ysp5"
|
||||||
|
},
|
||||||
"vim-dirtytalk": {
|
"vim-dirtytalk": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue