mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-26 23:16:46 +00:00
Compare commits
1 commit
cef76d0d91
...
1325fb62ef
| Author | SHA1 | Date | |
|---|---|---|---|
| 1325fb62ef |
42 changed files with 492 additions and 1217 deletions
|
|
@ -20,7 +20,6 @@ custom plugins that you might have added to your configuration.
|
||||||
|
|
||||||
```{=include=} sections
|
```{=include=} sections
|
||||||
custom-plugins/configuring.md
|
custom-plugins/configuring.md
|
||||||
custom-plugins/lazy-method.md
|
custom-plugins/new-method.md
|
||||||
custom-plugins/non-lazy-method.md
|
custom-plugins/old-method.md
|
||||||
custom-plugins/legacy-method.md
|
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,12 @@
|
||||||
# Configuring {#sec-configuring-plugins}
|
# Configuring {#sec-configuring-plugins}
|
||||||
|
|
||||||
Just making the plugin to your Neovim configuration available might not always be enough. In that
|
Just making the plugin to your Neovim configuration available might not always
|
||||||
case, you can write custom lua config using either `config.vim.lazy.plugins.*.setupOpts`
|
be enough. In that case, you can write custom lua config using either
|
||||||
`config.vim.extraPlugins.*.setup` or `config.vim.luaConfigRC`.
|
`config.vim.extraPlugins` (which has the `setup` field) or
|
||||||
|
`config.vim.luaConfigRC`. The first option uses an attribute set, which maps DAG
|
||||||
The first option uses an extended version of `lz.n`'s PluginSpec. `setupModule` and `setupOpt` can
|
section names to a custom type, which has the fields `package`, `after`,
|
||||||
be used if the plugin uses a `require('module').setup(...)` pattern. Otherwise, the `before` and
|
`setup`. They allow you to set the package of the plugin, the sections its setup
|
||||||
`after` hooks should do what you need.
|
code should be after (note that the `extraPlugins` option has its own DAG
|
||||||
|
|
||||||
```nix
|
|
||||||
{
|
|
||||||
config.vim.lazy.plugins = {
|
|
||||||
aerial-nvim = {
|
|
||||||
# ^^^^^^^^^ this name should match the package.pname or package.name
|
|
||||||
package = aerial-nvim;
|
|
||||||
|
|
||||||
setupModule = "aerial";
|
|
||||||
setupOpts = {option_name = false;};
|
|
||||||
|
|
||||||
after = "print('aerial loaded')";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
The second option uses an attribute set, which maps DAG section names to a custom type, which has
|
|
||||||
the fields `package`, `after`, `setup`. They allow you to set the package of the plugin, the
|
|
||||||
sections its setup code should be after (note that the `extraPlugins` option has its own DAG
|
|
||||||
scope), and the its setup code respectively. For example:
|
scope), and the its setup code respectively. For example:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
|
|
@ -44,7 +24,7 @@ config.vim.extraPlugins = with pkgs.vimPlugins; {
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
The third option also uses an attribute set, but this one is resolved as a DAG
|
The second option also uses an attribute set, but this one is resolved as a DAG
|
||||||
directly. The attribute names denote the section names, and the values lua code.
|
directly. The attribute names denote the section names, and the values lua code.
|
||||||
For example:
|
For example:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
# Lazy Method {#sec-lazy-method}
|
|
||||||
|
|
||||||
As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via
|
|
||||||
`lz.n` and `lzn-auto-require`.
|
|
||||||
|
|
||||||
```nix
|
|
||||||
{
|
|
||||||
config.vim.lazy.plugins = {
|
|
||||||
aerial = {
|
|
||||||
package = pkgs.vimPlugins.aerial-nvim;
|
|
||||||
setupModule = aerial;
|
|
||||||
setupOpts = {
|
|
||||||
option_name = true;
|
|
||||||
};
|
|
||||||
after = ''
|
|
||||||
-- custom lua code to run after plugin is loaded
|
|
||||||
print('aerial loaded')
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Explicitly mark plugin as lazy. You don't need this if you define one of
|
|
||||||
# the trigger "events" below
|
|
||||||
lazy = true;
|
|
||||||
|
|
||||||
# load on command
|
|
||||||
cmd = ["AerialOpen"];
|
|
||||||
|
|
||||||
# load on event
|
|
||||||
event = ["BufEnter"];
|
|
||||||
|
|
||||||
# load on keymap
|
|
||||||
keys = [
|
|
||||||
{
|
|
||||||
key = "<leader>a";
|
|
||||||
action = ":AerialToggle<CR>";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# Non-lazy Method {#sec-non-lazy-method}
|
# New Method {#sec-new-method}
|
||||||
|
|
||||||
As of version **0.5**, we have a more extensive API for configuring plugins,
|
As of version **0.5**, we have a more extensive API for configuring plugins,
|
||||||
under `vim.extraPlugins`. Instead of using DAGs exposed by the library, you may
|
under `vim.extraPlugins`. Instead of using DAGs exposed by the library, you may
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# Legacy Method {#sec-legacy-method}
|
# Old Method {#sec-old-method}
|
||||||
|
|
||||||
Prior to version 0.5, the method of adding new plugins was adding the plugin
|
Prior to version 0.5, the method of adding new plugins was adding the plugin
|
||||||
package to `vim.startPlugins` and add its configuration as a DAG under one of
|
package to `vim.startPlugins` and add its configuration as a DAG under one of
|
||||||
|
|
@ -12,14 +12,12 @@ entries in nvf:
|
||||||
2. `globalsScript` - used to set globals defined in `vim.globals`
|
2. `globalsScript` - used to set globals defined in `vim.globals`
|
||||||
3. `basic` - used to set basic configuration options
|
3. `basic` - used to set basic configuration options
|
||||||
4. `optionsScript` - used to set options defined in `vim.o`
|
4. `optionsScript` - used to set options defined in `vim.o`
|
||||||
5. `theme` (this is simply placed before `pluginConfigs` and `lazyConfigs`, meaning that
|
5. `theme` (this is simply placed before `pluginConfigs`, meaning that
|
||||||
surrounding entries don't depend on it) - used to set up the theme, which has to be done before
|
surrounding entries don't depend on it) - used to set up the theme, which has
|
||||||
other plugins
|
to be done before other plugins
|
||||||
6. `lazyConfigs` - `lz.n` and `lzn-auto-require` configs. If `vim.lazy.enable`
|
6. `pluginConfigs` - the result of the nested `vim.pluginRC` (internal option,
|
||||||
is false, this will contain each plugin's config instead.
|
|
||||||
7. `pluginConfigs` - the result of the nested `vim.pluginRC` (internal option,
|
|
||||||
see the [Custom Plugins](/index.xhtml#ch-custom-plugins) page for adding your
|
see the [Custom Plugins](/index.xhtml#ch-custom-plugins) page for adding your
|
||||||
own plugins) DAG, used to set up internal plugins
|
own plugins) DAG, used to set up internal plugins
|
||||||
8. `extraPluginConfigs` - the result of `vim.extraPlugins`, which is not a
|
7. `extraPluginConfigs` - the result of `vim.extraPlugins`, which is not a
|
||||||
direct DAG, but is converted to, and resolved as one internally
|
direct DAG, but is converted to, and resolved as one internally
|
||||||
9. `mappings` - the result of `vim.maps`
|
8. `mappings` - the result of `vim.maps`
|
||||||
|
|
|
||||||
|
|
@ -124,61 +124,3 @@ vim.your-plugin.setupOpts = {
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Lazy plugins {#sec-lazy-plugins}
|
|
||||||
|
|
||||||
If the plugin can be lazy-loaded, `vim.lazy.plugins` should be used to add it. Lazy
|
|
||||||
plugins are managed by `lz.n`.
|
|
||||||
|
|
||||||
```nix
|
|
||||||
# in modules/.../your-plugin/config.nix
|
|
||||||
{lib, config, ...}:
|
|
||||||
let
|
|
||||||
cfg = config.vim.your-plugin;
|
|
||||||
in {
|
|
||||||
vim.lazy.plugins.your-plugin = {
|
|
||||||
# instead of vim.startPlugins, use this:
|
|
||||||
package = "your-plugin";
|
|
||||||
|
|
||||||
# if your plugin uses the `require('your-plugin').setup{...}` pattern
|
|
||||||
setupModule = "your-plugin";
|
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
|
|
||||||
# events that trigger this plugin to be loaded
|
|
||||||
event = ["DirChanged"];
|
|
||||||
cmd = ["YourPluginCommand"];
|
|
||||||
|
|
||||||
# keymaps
|
|
||||||
keys = [
|
|
||||||
# we'll cover this in detail in the keymaps section
|
|
||||||
{
|
|
||||||
key = "<leader>d";
|
|
||||||
mode = "n";
|
|
||||||
action = ":YourPluginCommand";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
This results in the following lua code:
|
|
||||||
```lua
|
|
||||||
require('lz.n').load({
|
|
||||||
{
|
|
||||||
"name-of-your-plugin",
|
|
||||||
after = function()
|
|
||||||
require('your-plugin').setup({--[[ your setupOpts ]]})
|
|
||||||
end,
|
|
||||||
|
|
||||||
event = {"DirChanged"},
|
|
||||||
cmd = {"YourPluginCommand"},
|
|
||||||
keys = {
|
|
||||||
{"<leader>d", ":YourPluginCommand", mode = {"n"}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
A full list of options can be found
|
|
||||||
[here](https://notashelf.github.io/nvf/options.html#opt-vim.lazy.plugins
|
|
||||||
|
|
|
||||||
|
|
@ -123,10 +123,6 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
|
||||||
recommended to go through rustacean.nvim's README to take a closer look at its
|
recommended to go through rustacean.nvim's README to take a closer look at its
|
||||||
features and usage
|
features and usage
|
||||||
|
|
||||||
- Add [lz.n] support and lazy-load some builtin plugins.
|
|
||||||
|
|
||||||
[lz.n]: https://github.com/mrcjkb/lz.n
|
|
||||||
|
|
||||||
[jacekpoz](https://jacekpoz.pl):
|
[jacekpoz](https://jacekpoz.pl):
|
||||||
|
|
||||||
[ocaml-lsp]: https://github.com/ocaml/ocaml-lsp
|
[ocaml-lsp]: https://github.com/ocaml/ocaml-lsp
|
||||||
|
|
|
||||||
52
flake.lock
52
flake.lock
|
|
@ -892,39 +892,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"plugin-lz-n": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729525284,
|
|
||||||
"narHash": "sha256-fk+ejqcqqOQz3q4D3VB2Q+U/6wCpCDk1tiDMp2YrPNE=",
|
|
||||||
"owner": "nvim-neorocks",
|
|
||||||
"repo": "lz.n",
|
|
||||||
"rev": "ffd9991400ba7137f4fa8560ff50bccd7f8fb3ee",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nvim-neorocks",
|
|
||||||
"repo": "lz.n",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plugin-lzn-auto-require": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1727636949,
|
|
||||||
"narHash": "sha256-BAOzN+XOrFAJwHmsF8JtZ2EyjP9283FD/I2TbFqGSEw=",
|
|
||||||
"owner": "horriblename",
|
|
||||||
"repo": "lzn-auto-require",
|
|
||||||
"rev": "55ecd60831dac8c01d6f3dcb63a30a63a1690eb8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "horriblename",
|
|
||||||
"ref": "require-rewrite",
|
|
||||||
"repo": "lzn-auto-require",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plugin-mind-nvim": {
|
"plugin-mind-nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -1662,22 +1629,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"plugin-rtp-nvim": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1724409589,
|
|
||||||
"narHash": "sha256-lmJbiD7I7MTEEpukESs67uAmLyn+p66hrUKLbEHp0Kw=",
|
|
||||||
"owner": "nvim-neorocks",
|
|
||||||
"repo": "rtp.nvim",
|
|
||||||
"rev": "494ddfc888bb466555d90ace731856de1320fe45",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nvim-neorocks",
|
|
||||||
"repo": "rtp.nvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plugin-rustaceanvim": {
|
"plugin-rustaceanvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -2040,8 +1991,6 @@
|
||||||
"plugin-lua-utils-nvim": "plugin-lua-utils-nvim",
|
"plugin-lua-utils-nvim": "plugin-lua-utils-nvim",
|
||||||
"plugin-lualine": "plugin-lualine",
|
"plugin-lualine": "plugin-lualine",
|
||||||
"plugin-luasnip": "plugin-luasnip",
|
"plugin-luasnip": "plugin-luasnip",
|
||||||
"plugin-lz-n": "plugin-lz-n",
|
|
||||||
"plugin-lzn-auto-require": "plugin-lzn-auto-require",
|
|
||||||
"plugin-mind-nvim": "plugin-mind-nvim",
|
"plugin-mind-nvim": "plugin-mind-nvim",
|
||||||
"plugin-minimap-vim": "plugin-minimap-vim",
|
"plugin-minimap-vim": "plugin-minimap-vim",
|
||||||
"plugin-modes-nvim": "plugin-modes-nvim",
|
"plugin-modes-nvim": "plugin-modes-nvim",
|
||||||
|
|
@ -2088,7 +2037,6 @@
|
||||||
"plugin-project-nvim": "plugin-project-nvim",
|
"plugin-project-nvim": "plugin-project-nvim",
|
||||||
"plugin-registers": "plugin-registers",
|
"plugin-registers": "plugin-registers",
|
||||||
"plugin-rose-pine": "plugin-rose-pine",
|
"plugin-rose-pine": "plugin-rose-pine",
|
||||||
"plugin-rtp-nvim": "plugin-rtp-nvim",
|
|
||||||
"plugin-rustaceanvim": "plugin-rustaceanvim",
|
"plugin-rustaceanvim": "plugin-rustaceanvim",
|
||||||
"plugin-scrollbar-nvim": "plugin-scrollbar-nvim",
|
"plugin-scrollbar-nvim": "plugin-scrollbar-nvim",
|
||||||
"plugin-smartcolumn": "plugin-smartcolumn",
|
"plugin-smartcolumn": "plugin-smartcolumn",
|
||||||
|
|
|
||||||
16
flake.nix
16
flake.nix
|
|
@ -113,22 +113,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
## Plugins
|
## Plugins
|
||||||
# Lazy loading
|
|
||||||
plugin-lz-n = {
|
|
||||||
url = "github:nvim-neorocks/lz.n";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
plugin-lzn-auto-require = {
|
|
||||||
url = "github:horriblename/lzn-auto-require/require-rewrite";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
plugin-rtp-nvim = {
|
|
||||||
url = "github:nvim-neorocks/rtp.nvim";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# LSP plugins
|
# LSP plugins
|
||||||
plugin-nvim-lspconfig = {
|
plugin-nvim-lspconfig = {
|
||||||
url = "github:neovim/nvim-lspconfig";
|
url = "github:neovim/nvim-lspconfig";
|
||||||
|
|
|
||||||
|
|
@ -67,30 +67,6 @@
|
||||||
mkLuaBinding binding.value action binding.description;
|
mkLuaBinding binding.value action binding.description;
|
||||||
|
|
||||||
pushDownDefault = attr: mapAttrs (_: mkDefault) attr;
|
pushDownDefault = attr: mapAttrs (_: mkDefault) attr;
|
||||||
|
|
||||||
mkLznBinding = mode: key: action: desc: {
|
|
||||||
inherit mode desc key action;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkLznExprBinding = mode: key: action: desc: {
|
|
||||||
inherit mode desc key action;
|
|
||||||
lua = true;
|
|
||||||
silent = true;
|
|
||||||
expr = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkSetLznBinding = binding: action: {
|
|
||||||
inherit action;
|
|
||||||
key = binding.value;
|
|
||||||
desc = binding.description;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkSetLuaLznBinding = binding: action: {
|
|
||||||
inherit action;
|
|
||||||
key = binding.value;
|
|
||||||
lua = true;
|
|
||||||
desc = binding.description;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
binds
|
binds
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,10 @@
|
||||||
|
|
||||||
# built (or "normalized") plugins that are modified
|
# built (or "normalized") plugins that are modified
|
||||||
builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
|
builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
|
||||||
builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.optPlugins);
|
builtOptPlugins = map (package: {
|
||||||
|
plugin = package;
|
||||||
|
optional = true;
|
||||||
|
}) (buildConfigPlugins vimOptions.optPlugins);
|
||||||
|
|
||||||
# additional Lua and Python3 packages, mapped to their respective functions
|
# additional Lua and Python3 packages, mapped to their respective functions
|
||||||
# to conform to the format mnw expects. end user should
|
# to conform to the format mnw expects. end user should
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,6 @@
|
||||||
"build"
|
"build"
|
||||||
"rc"
|
"rc"
|
||||||
"warnings"
|
"warnings"
|
||||||
"lazy"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Extra modules, such as deprecation warnings
|
# Extra modules, such as deprecation warnings
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,11 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (builtins) toJSON;
|
inherit (builtins) toJSON;
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
inherit (lib.lists) optionals;
|
||||||
|
inherit (lib.nvim.binds) mkLuaBinding;
|
||||||
|
|
||||||
cfg = config.vim.assistant.copilot;
|
cfg = config.vim.assistant.copilot;
|
||||||
|
|
||||||
|
|
@ -20,52 +23,30 @@
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mkLuaKeymap = mode: key: action: desc: opts:
|
|
||||||
opts
|
|
||||||
// {
|
|
||||||
inherit mode key action desc;
|
|
||||||
lua = true;
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim.startPlugins =
|
||||||
lazy.plugins = {
|
[
|
||||||
copilot-lua = {
|
"copilot-lua"
|
||||||
package = "copilot-lua";
|
# cfg.copilotNodePackage
|
||||||
setupModule = "copilot";
|
]
|
||||||
inherit (cfg) setupOpts;
|
++ optionals cfg.cmp.enable [
|
||||||
after = mkIf cfg.cmp.enable "require('copilot_cmp').setup()";
|
"copilot-cmp"
|
||||||
|
|
||||||
cmd = ["Copilot" "CopilotAuth" "CopilotDetach" "CopilotPanel" "CopilotStop"];
|
|
||||||
keys = [
|
|
||||||
(mkLuaKeymap ["n"] cfg.mappings.panel.accept (wrapPanelBinding ''require("copilot.panel").accept'' cfg.mappings.panel.accept) "[copilot] Accept suggestion" {})
|
|
||||||
(mkLuaKeymap ["n"] cfg.mappings.panel.jumpNext (wrapPanelBinding "require(\"copilot.panel\").jump_next" cfg.mappings.panel.jumpNext) "[copilot] Accept suggestion" {})
|
|
||||||
(mkLuaKeymap ["n"] cfg.mappings.panel.jumpPrev (wrapPanelBinding "require(\"copilot.panel\").jump_prev" cfg.mappings.panel.jumpPrev) "[copilot] Accept suggestion" {})
|
|
||||||
(mkLuaKeymap ["n"] cfg.mappings.panel.refresh (wrapPanelBinding "require(\"copilot.panel\").refresh" cfg.mappings.panel.refresh) "[copilot] Accept suggestion" {})
|
|
||||||
(mkLuaKeymap ["n"] cfg.mappings.panel.open (wrapPanelBinding ''
|
|
||||||
function() require("copilot.panel").open({ position = "${cfg.setupOpts.panel.layout.position}", ratio = ${toString cfg.setupOpts.panel.layout.ratio}, }) end
|
|
||||||
''
|
|
||||||
cfg.mappings.panel.open) "[copilot] Accept suggestion" {})
|
|
||||||
|
|
||||||
(mkLuaKeymap ["i"] cfg.mappings.suggestion.accept "function() require('copilot.suggestion').accept() end" "[copilot] Accept suggestion" {})
|
|
||||||
(mkLuaKeymap ["i"] cfg.mappings.suggestion.acceptLine "function() require('copilot.suggestion').accept_line() end" "[copilot] Accept suggestion (line)" {})
|
|
||||||
(mkLuaKeymap ["i"] cfg.mappings.suggestion.acceptWord "function() require('copilot.suggestion').accept_word() end" "[copilot] Accept suggestion (word)" {})
|
|
||||||
(mkLuaKeymap ["i"] cfg.mappings.suggestion.dismiss "function() require('copilot.suggestion').dismiss() end" "[copilot] dismiss suggestion" {})
|
|
||||||
(mkLuaKeymap ["i"] cfg.mappings.suggestion.next "function() require('copilot.suggestion').next() end" "[copilot] next suggestion" {})
|
|
||||||
(mkLuaKeymap ["i"] cfg.mappings.suggestion.prev "function() require('copilot.suggestion').prev() end" "[copilot] previous suggestion" {})
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
autocomplete.nvim-cmp = {
|
vim.autocomplete.nvim-cmp.sources = {copilot = "[Copilot]";};
|
||||||
sources = {copilot = "[Copilot]";};
|
|
||||||
sourcePlugins = ["copilot-cmp"];
|
vim.pluginRC.copilot = entryAnywhere ''
|
||||||
};
|
require("copilot").setup(${toLuaObject cfg.setupOpts})
|
||||||
|
|
||||||
|
${lib.optionalString cfg.cmp.enable ''
|
||||||
|
require("copilot_cmp").setup()
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
|
||||||
# Disable plugin handled keymaps.
|
# Disable plugin handled keymaps.
|
||||||
# Setting it here so that it doesn't show up in user docs
|
# Setting it here so that it doesn't show up in user docs
|
||||||
assistant.copilot.setupOpts = {
|
vim.assistant.copilot.setupOpts = {
|
||||||
panel.keymap = {
|
panel.keymap = {
|
||||||
jump_prev = lib.mkDefault false;
|
jump_prev = lib.mkDefault false;
|
||||||
jump_next = lib.mkDefault false;
|
jump_next = lib.mkDefault false;
|
||||||
|
|
@ -82,6 +63,25 @@ in {
|
||||||
dismiss = lib.mkDefault false;
|
dismiss = lib.mkDefault false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
vim.maps.normal = mkMerge [
|
||||||
|
(mkLuaBinding cfg.mappings.panel.jumpPrev (wrapPanelBinding "require(\"copilot.panel\").jump_prev" cfg.mappings.panel.jumpPrev) "[copilot] Accept suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.panel.jumpNext (wrapPanelBinding "require(\"copilot.panel\").jump_next" cfg.mappings.panel.jumpNext) "[copilot] Accept suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.panel.accept (wrapPanelBinding ''require("copilot.panel").accept'' cfg.mappings.panel.accept) "[copilot] Accept suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.panel.refresh (wrapPanelBinding "require(\"copilot.panel\").refresh" cfg.mappings.panel.refresh) "[copilot] Accept suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.panel.open (wrapPanelBinding ''
|
||||||
|
function() require("copilot.panel").open({ position = "${cfg.setupOpts.panel.layout.position}", ratio = ${toString cfg.setupOpts.panel.layout.ratio}, }) end
|
||||||
|
''
|
||||||
|
cfg.mappings.panel.open) "[copilot] Accept suggestion")
|
||||||
|
];
|
||||||
|
|
||||||
|
vim.maps.insert = mkMerge [
|
||||||
|
(mkLuaBinding cfg.mappings.suggestion.accept "require(\"copilot.suggestion\").accept" "[copilot] Accept suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.suggestion.acceptLine "require(\"copilot.suggestion\").accept_line" "[copilot] Accept suggestion (line)")
|
||||||
|
(mkLuaBinding cfg.mappings.suggestion.acceptWord "require(\"copilot.suggestion\").accept_word" "[copilot] Accept suggestion (word)")
|
||||||
|
(mkLuaBinding cfg.mappings.suggestion.next "require(\"copilot.suggestion\").next" "[copilot] next suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.suggestion.prev "require(\"copilot.suggestion\").prev" "[copilot] previous suggestion")
|
||||||
|
(mkLuaBinding cfg.mappings.suggestion.dismiss "require(\"copilot.suggestion\").dismiss" "[copilot] dismiss suggestion")
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{lib, ...}: let
|
{lib, ...}: let
|
||||||
inherit (lib.options) mkEnableOption;
|
inherit (lib.options) mkEnableOption;
|
||||||
inherit (lib.nvim.binds) mkMappingOption;
|
inherit (lib.nvim.binds) mkMappingOption;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
||||||
in {
|
in {
|
||||||
options.vim.comments.comment-nvim = {
|
options.vim.comments.comment-nvim = {
|
||||||
enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim";
|
enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim";
|
||||||
|
|
@ -16,12 +15,5 @@ in {
|
||||||
toggleSelectedLine = mkMappingOption "Toggle selected comment" "gc";
|
toggleSelectedLine = mkMappingOption "Toggle selected comment" "gc";
|
||||||
toggleSelectedBlock = mkMappingOption "Toggle selected block" "gb";
|
toggleSelectedBlock = mkMappingOption "Toggle selected block" "gb";
|
||||||
};
|
};
|
||||||
|
|
||||||
setupOpts = mkPluginSetupOption "Comment-nvim" {
|
|
||||||
mappings = {
|
|
||||||
basic = mkEnableOption "basic mappings";
|
|
||||||
extra = mkEnableOption "extra mappings";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,38 +3,46 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.nvim.binds) mkLznExprBinding mkLznBinding;
|
inherit (lib.nvim.binds) mkExprBinding mkBinding;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
|
||||||
cfg = config.vim.comments.comment-nvim;
|
cfg = config.vim.comments.comment-nvim;
|
||||||
self = import ./comment-nvim.nix {inherit lib;};
|
self = import ./comment-nvim.nix {inherit lib;};
|
||||||
inherit (self.options.vim.comments.comment-nvim) mappings;
|
inherit (self.options.vim.comments.comment-nvim) mappings;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim.lazy.plugins.comment-nvim = {
|
vim.startPlugins = ["comment-nvim"];
|
||||||
package = "comment-nvim";
|
|
||||||
setupModule = "Comment";
|
vim.maps.normal = mkMerge [
|
||||||
inherit (cfg) setupOpts;
|
(mkBinding cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description)
|
||||||
keys = [
|
(mkBinding cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description)
|
||||||
(mkLznBinding ["n"] cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description)
|
|
||||||
(mkLznBinding ["n"] cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description)
|
(mkExprBinding cfg.mappings.toggleCurrentLine ''
|
||||||
(mkLznExprBinding ["n"] cfg.mappings.toggleCurrentLine ''
|
|
||||||
function()
|
function()
|
||||||
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
|
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
|
||||||
or '<Plug>(comment_toggle_linewise_count)'
|
or '<Plug>(comment_toggle_linewise_count)'
|
||||||
end
|
end
|
||||||
''
|
''
|
||||||
mappings.toggleCurrentLine.description)
|
mappings.toggleCurrentLine.description)
|
||||||
(mkLznExprBinding ["n"] cfg.mappings.toggleCurrentBlock ''
|
(mkExprBinding cfg.mappings.toggleCurrentBlock ''
|
||||||
function()
|
function()
|
||||||
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
|
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
|
||||||
or '<Plug>(comment_toggle_blockwise_count)'
|
or '<Plug>(comment_toggle_blockwise_count)'
|
||||||
end
|
end
|
||||||
''
|
''
|
||||||
mappings.toggleCurrentBlock.description)
|
mappings.toggleCurrentBlock.description)
|
||||||
(mkLznBinding ["x"] cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
|
|
||||||
(mkLznBinding ["x"] cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
vim.maps.visual = mkMerge [
|
||||||
|
(mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
|
||||||
|
(mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
|
||||||
|
];
|
||||||
|
|
||||||
|
vim.pluginRC.comment-nvim = entryAnywhere ''
|
||||||
|
require('Comment').setup({
|
||||||
|
mappings = { basic = false, extra = false, },
|
||||||
|
})
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,68 +3,32 @@
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf;
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.strings) optionalString;
|
||||||
inherit (lib.generators) mkLuaInline;
|
inherit (lib.generators) mkLuaInline;
|
||||||
|
inherit (lib.nvim.dag) entryAfter;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (lib.nvim.attrsets) mapListToAttrs;
|
inherit (builtins) attrNames;
|
||||||
inherit (builtins) attrNames typeOf tryEval concatStringsSep;
|
|
||||||
|
|
||||||
cfg = config.vim.autocomplete.nvim-cmp;
|
cfg = config.vim.autocomplete.nvim-cmp;
|
||||||
luasnipEnable = config.vim.snippets.luasnip.enable;
|
luasnipEnable = config.vim.snippets.luasnip.enable;
|
||||||
getPluginName = plugin:
|
|
||||||
if typeOf plugin == "string"
|
|
||||||
then plugin
|
|
||||||
else if (plugin ? pname && (tryEval plugin.pname).success)
|
|
||||||
then plugin.pname
|
|
||||||
else plugin.name;
|
|
||||||
inherit (cfg) mappings;
|
inherit (cfg) mappings;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["rtp-nvim"];
|
startPlugins = [
|
||||||
lazy.plugins = mkMerge [
|
"nvim-cmp"
|
||||||
(mapListToAttrs (package: {
|
"cmp-buffer"
|
||||||
name = getPluginName package;
|
"cmp-path"
|
||||||
value = {
|
|
||||||
inherit package;
|
|
||||||
lazy = true;
|
|
||||||
after = ''
|
|
||||||
local path = vim.fn.globpath(vim.o.packpath, 'pack/*/opt/${getPluginName package}')
|
|
||||||
require("rtp_nvim").source_after_plugin_dir(path)
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
})
|
|
||||||
cfg.sourcePlugins)
|
|
||||||
{
|
|
||||||
nvim-cmp = {
|
|
||||||
package = "nvim-cmp";
|
|
||||||
after = ''
|
|
||||||
${optionalString luasnipEnable "local luasnip = require('luasnip')"}
|
|
||||||
local cmp = require("cmp")
|
|
||||||
cmp.setup(${toLuaObject cfg.setupOpts})
|
|
||||||
|
|
||||||
${optionalString config.vim.lazy.enable
|
|
||||||
(concatStringsSep "\n" (map
|
|
||||||
(package: "require('lz.n').trigger_load(${toLuaObject (getPluginName package)})")
|
|
||||||
cfg.sourcePlugins))}
|
|
||||||
'';
|
|
||||||
|
|
||||||
event = ["InsertEnter" "CmdlineEnter"];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
autocomplete.nvim-cmp = {
|
autocomplete.nvim-cmp.sources = {
|
||||||
sources = {
|
|
||||||
nvim-cmp = null;
|
nvim-cmp = null;
|
||||||
buffer = "[Buffer]";
|
buffer = "[Buffer]";
|
||||||
path = "[Path]";
|
path = "[Path]";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourcePlugins = ["cmp-buffer" "cmp-path"];
|
autocomplete.nvim-cmp.setupOpts = {
|
||||||
|
|
||||||
setupOpts = {
|
|
||||||
sources = map (s: {name = s;}) (attrNames cfg.sources);
|
sources = map (s: {name = s;}) (attrNames cfg.sources);
|
||||||
|
|
||||||
# TODO: try to get nvim-cmp to follow global border style
|
# TODO: try to get nvim-cmp to follow global border style
|
||||||
|
|
@ -74,9 +38,16 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
formatting.format = cfg.format;
|
formatting.format = cfg.format;
|
||||||
|
};
|
||||||
|
|
||||||
|
pluginRC.nvim-cmp = mkIf cfg.enable (entryAfter ["autopairs" "luasnip"] ''
|
||||||
|
${optionalString luasnipEnable "local luasnip = require('luasnip')"}
|
||||||
|
local cmp = require("cmp")
|
||||||
|
cmp.setup(${toLuaObject cfg.setupOpts})
|
||||||
|
'');
|
||||||
|
|
||||||
# `cmp` and `luasnip` are defined above, in the `nvim-cmp` section
|
# `cmp` and `luasnip` are defined above, in the `nvim-cmp` section
|
||||||
mapping = {
|
autocomplete.nvim-cmp.setupOpts.mapping = {
|
||||||
${mappings.complete} = mkLuaInline "cmp.mapping.complete()";
|
${mappings.complete} = mkLuaInline "cmp.mapping.complete()";
|
||||||
${mappings.close} = mkLuaInline "cmp.mapping.abort()";
|
${mappings.close} = mkLuaInline "cmp.mapping.abort()";
|
||||||
${mappings.scrollDocsUp} = mkLuaInline "cmp.mapping.scroll_docs(-4)";
|
${mappings.scrollDocsUp} = mkLuaInline "cmp.mapping.scroll_docs(-4)";
|
||||||
|
|
@ -120,6 +91,4 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
|
inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
|
||||||
inherit (lib.types) str attrsOf nullOr either listOf;
|
inherit (lib.types) str attrsOf nullOr either;
|
||||||
inherit (lib.generators) mkLuaInline;
|
inherit (lib.generators) mkLuaInline;
|
||||||
inherit (lib.nvim.binds) mkMappingOption;
|
inherit (lib.nvim.binds) mkMappingOption;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption luaInline mergelessListOf pluginType;
|
inherit (lib.nvim.types) mkPluginSetupOption luaInline mergelessListOf;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (builtins) isString;
|
inherit (builtins) isString;
|
||||||
|
|
||||||
|
|
@ -99,11 +99,5 @@ in {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
sourcePlugins = mkOption {
|
|
||||||
type = listOf pluginType;
|
|
||||||
default = [];
|
|
||||||
description = "List of source plugins used by nvim-cmp.";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.strings) optionalString;
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.attrsets) mapAttrs;
|
inherit (lib.attrsets) mapAttrs;
|
||||||
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding mkSetLuaLznBinding;
|
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding;
|
||||||
inherit (lib.nvim.dag) entryAnywhere entryAfter;
|
inherit (lib.nvim.dag) entryAnywhere entryAfter;
|
||||||
|
|
||||||
cfg = config.vim.debugger.nvim-dap;
|
cfg = config.vim.debugger.nvim-dap;
|
||||||
|
|
@ -52,31 +52,24 @@ in {
|
||||||
})
|
})
|
||||||
(mkIf (cfg.enable && cfg.ui.enable) {
|
(mkIf (cfg.enable && cfg.ui.enable) {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["nvim-nio"];
|
startPlugins = ["nvim-dap-ui" "nvim-nio"];
|
||||||
|
|
||||||
lazy.plugins.nvim-dap-ui = {
|
pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (''
|
||||||
package = "nvim-dap-ui";
|
local dapui = require("dapui")
|
||||||
setupModule = "dapui";
|
dapui.setup()
|
||||||
inherit (cfg.ui) setupOpts;
|
''
|
||||||
|
+ optionalString cfg.ui.autoStart ''
|
||||||
keys = [
|
|
||||||
(mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end")
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
|
|
||||||
optionalString cfg.ui.autoStart ''
|
|
||||||
dap.listeners.after.event_initialized["dapui_config"] = function()
|
dap.listeners.after.event_initialized["dapui_config"] = function()
|
||||||
require("dapui").open()
|
dapui.open()
|
||||||
end
|
end
|
||||||
dap.listeners.before.event_terminated["dapui_config"] = function()
|
dap.listeners.before.event_terminated["dapui_config"] = function()
|
||||||
require("dapui").close()
|
dapui.close()
|
||||||
end
|
end
|
||||||
dap.listeners.before.event_exited["dapui_config"] = function()
|
dap.listeners.before.event_exited["dapui_config"] = function()
|
||||||
require("dapui").close()
|
dapui.close()
|
||||||
end
|
end
|
||||||
''
|
'');
|
||||||
);
|
maps.normal = mkSetLuaBinding mappings.toggleDapUI "require('dapui').toggle";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,12 @@
|
||||||
inherit (lib.options) mkEnableOption mkOption;
|
inherit (lib.options) mkEnableOption mkOption;
|
||||||
inherit (lib.types) bool attrsOf str;
|
inherit (lib.types) bool attrsOf str;
|
||||||
inherit (lib.nvim.binds) mkMappingOption;
|
inherit (lib.nvim.binds) mkMappingOption;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
||||||
in {
|
in {
|
||||||
options.vim.debugger.nvim-dap = {
|
options.vim.debugger.nvim-dap = {
|
||||||
enable = mkEnableOption "debugging via nvim-dap";
|
enable = mkEnableOption "debugging via nvim-dap";
|
||||||
|
|
||||||
ui = {
|
ui = {
|
||||||
enable = mkEnableOption "UI extension for nvim-dap";
|
enable = mkEnableOption "UI extension for nvim-dap";
|
||||||
|
|
||||||
setupOpts = mkPluginSetupOption "nvim-dap-ui" {};
|
|
||||||
|
|
||||||
autoStart = mkOption {
|
autoStart = mkOption {
|
||||||
type = bool;
|
type = bool;
|
||||||
default = true;
|
default = true;
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
|
|
||||||
cfg = config.vim.filetree.neo-tree;
|
cfg = config.vim.filetree.neo-tree;
|
||||||
in {
|
in {
|
||||||
|
|
@ -14,17 +16,15 @@ in {
|
||||||
"plenary-nvim" # commons library
|
"plenary-nvim" # commons library
|
||||||
"image-nvim" # optional for image previews
|
"image-nvim" # optional for image previews
|
||||||
"nui-nvim" # ui library
|
"nui-nvim" # ui library
|
||||||
|
# neotree
|
||||||
|
"neo-tree-nvim"
|
||||||
];
|
];
|
||||||
|
|
||||||
lazy.plugins.neo-tree-nvim = {
|
|
||||||
package = "neo-tree-nvim";
|
|
||||||
setupModule = "neo-tree";
|
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
|
|
||||||
cmd = ["Neotree"];
|
|
||||||
};
|
|
||||||
|
|
||||||
visuals.nvimWebDevicons.enable = true;
|
visuals.nvimWebDevicons.enable = true;
|
||||||
|
|
||||||
|
pluginRC.neo-tree = entryAnywhere ''
|
||||||
|
require("neo-tree").setup(${toLuaObject cfg.setupOpts})
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,10 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.strings) optionalString;
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.nvim.binds) mkLznBinding;
|
inherit (lib.nvim.binds) mkBinding;
|
||||||
inherit (lib.nvim.dag) entryAnywhere;
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (lib.nvim.binds) pushDownDefault;
|
inherit (lib.nvim.binds) pushDownDefault;
|
||||||
|
|
||||||
cfg = config.vim.filetree.nvimTree;
|
cfg = config.vim.filetree.nvimTree;
|
||||||
|
|
@ -15,25 +16,20 @@
|
||||||
inherit (self.options.vim.filetree.nvimTree) mappings;
|
inherit (self.options.vim.filetree.nvimTree) mappings;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim.startPlugins = ["nvim-tree-lua"];
|
||||||
binds.whichKey.register = pushDownDefault {
|
|
||||||
|
vim.maps.normal = mkMerge [
|
||||||
|
(mkBinding cfg.mappings.toggle ":NvimTreeToggle<cr>" mappings.toggle.description)
|
||||||
|
(mkBinding cfg.mappings.refresh ":NvimTreeRefresh<cr>" mappings.refresh.description)
|
||||||
|
(mkBinding cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description)
|
||||||
|
(mkBinding cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description)
|
||||||
|
];
|
||||||
|
|
||||||
|
vim.binds.whichKey.register = pushDownDefault {
|
||||||
"<leader>t" = "+NvimTree";
|
"<leader>t" = "+NvimTree";
|
||||||
};
|
};
|
||||||
|
|
||||||
lazy.plugins.nvim-tree-lua = {
|
vim.pluginRC.nvimtreelua = entryAnywhere ''
|
||||||
package = "nvim-tree-lua";
|
|
||||||
setupModule = "nvim-tree";
|
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
cmd = ["NvimTreeClipboard" "NvimTreeClose" "NvimTreeCollapse" "NvimTreeCollapseKeepBuffers" "NvimTreeFindFile" "NvimTreeFindFileToggle" "NvimTreeFocus" "NvimTreeHiTest" "NvimTreeOpen" "NvimTreeRefresh" "NvimTreeResize" "NvimTreeToggle"];
|
|
||||||
keys = [
|
|
||||||
(mkLznBinding ["n"] cfg.mappings.toggle ":NvimTreeToggle<cr>" mappings.toggle.description)
|
|
||||||
(mkLznBinding ["n"] cfg.mappings.refresh ":NvimTreeRefresh<cr>" mappings.refresh.description)
|
|
||||||
(mkLznBinding ["n"] cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description)
|
|
||||||
(mkLznBinding ["n"] cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
pluginRC.nvimtreelua = entryAnywhere ''
|
|
||||||
${
|
${
|
||||||
optionalString cfg.setupOpts.disable_netrw ''
|
optionalString cfg.setupOpts.disable_netrw ''
|
||||||
-- disable netrew completely
|
-- disable netrew completely
|
||||||
|
|
@ -42,9 +38,10 @@ in {
|
||||||
''
|
''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
require'nvim-tree'.setup(${toLuaObject cfg.setupOpts})
|
||||||
|
|
||||||
${
|
${
|
||||||
optionalString cfg.openOnSetup ''
|
optionalString cfg.openOnSetup ''
|
||||||
${optionalString config.vim.lazy.enable ''require('lz.n').trigger_load("nvim-tree-lua")''}
|
|
||||||
-- autostart behaviour
|
-- autostart behaviour
|
||||||
-- Open on startup has been deprecated
|
-- Open on startup has been deprecated
|
||||||
-- see https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup
|
-- see https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup
|
||||||
|
|
@ -84,5 +81,4 @@ in {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
|
inherit (lib.lists) optional;
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.strings) optionalString;
|
||||||
inherit (lib.trivial) boolToString;
|
inherit (lib.trivial) boolToString;
|
||||||
inherit (lib.nvim.binds) addDescriptionsToMappings;
|
inherit (lib.nvim.binds) addDescriptionsToMappings;
|
||||||
|
|
@ -22,10 +23,9 @@
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
autocomplete.nvim-cmp = {
|
startPlugins = optional usingNvimCmp "cmp-nvim-lsp";
|
||||||
sources = {nvim_lsp = "[LSP]";};
|
|
||||||
sourcePlugins = ["cmp-nvim-lsp"];
|
autocomplete.nvim-cmp.sources = {nvim_lsp = "[LSP]";};
|
||||||
};
|
|
||||||
|
|
||||||
pluginRC.lsp-setup = ''
|
pluginRC.lsp-setup = ''
|
||||||
vim.g.formatsave = ${boolToString cfg.formatOnSave};
|
vim.g.formatsave = ${boolToString cfg.formatOnSave};
|
||||||
|
|
@ -116,60 +116,7 @@ in {
|
||||||
end
|
end
|
||||||
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
${optionalString usingNvimCmp ''
|
${optionalString usingNvimCmp "capabilities = require('cmp_nvim_lsp').default_capabilities()"}
|
||||||
-- HACK: copied from cmp-nvim-lsp. If we ever lazy load lspconfig we
|
|
||||||
-- should re-evaluate whether we can just use `default_capabilities`
|
|
||||||
capabilities = {
|
|
||||||
textDocument = {
|
|
||||||
completion = {
|
|
||||||
dynamicRegistration = false,
|
|
||||||
completionItem = {
|
|
||||||
snippetSupport = true,
|
|
||||||
commitCharactersSupport = true,
|
|
||||||
deprecatedSupport = true,
|
|
||||||
preselectSupport = true,
|
|
||||||
tagSupport = {
|
|
||||||
valueSet = {
|
|
||||||
1, -- Deprecated
|
|
||||||
}
|
|
||||||
},
|
|
||||||
insertReplaceSupport = true,
|
|
||||||
resolveSupport = {
|
|
||||||
properties = {
|
|
||||||
"documentation",
|
|
||||||
"detail",
|
|
||||||
"additionalTextEdits",
|
|
||||||
"sortText",
|
|
||||||
"filterText",
|
|
||||||
"insertText",
|
|
||||||
"textEdit",
|
|
||||||
"insertTextFormat",
|
|
||||||
"insertTextMode",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
insertTextModeSupport = {
|
|
||||||
valueSet = {
|
|
||||||
1, -- asIs
|
|
||||||
2, -- adjustIndentation
|
|
||||||
}
|
|
||||||
},
|
|
||||||
labelDetailsSupport = true,
|
|
||||||
},
|
|
||||||
contextSupport = true,
|
|
||||||
insertTextMode = 1,
|
|
||||||
completionList = {
|
|
||||||
itemDefaults = {
|
|
||||||
'commitCharacters',
|
|
||||||
'editRange',
|
|
||||||
'insertTextFormat',
|
|
||||||
'insertTextMode',
|
|
||||||
'data',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
''}
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,40 +1,41 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
options,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLznBinding pushDownDefault;
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding pushDownDefault;
|
||||||
|
|
||||||
cfg = config.vim.lsp;
|
cfg = config.vim.lsp;
|
||||||
|
|
||||||
mappingDefinitions = options.vim.lsp.trouble.mappings;
|
self = import ./trouble.nix {inherit lib;};
|
||||||
|
mappingDefinitions = self.options.vim.lsp.trouble.mappings;
|
||||||
mappings = addDescriptionsToMappings cfg.trouble.mappings mappingDefinitions;
|
mappings = addDescriptionsToMappings cfg.trouble.mappings mappingDefinitions;
|
||||||
in {
|
in {
|
||||||
config = mkIf (cfg.enable && cfg.trouble.enable) {
|
config = mkIf (cfg.enable && cfg.trouble.enable) {
|
||||||
vim = {
|
vim = {
|
||||||
lazy.plugins.trouble = {
|
startPlugins = ["trouble"];
|
||||||
package = "trouble";
|
|
||||||
setupModule = "trouble";
|
|
||||||
inherit (cfg.trouble) setupOpts;
|
|
||||||
|
|
||||||
cmd = "Trouble";
|
maps.normal = mkMerge [
|
||||||
keys = [
|
(mkSetBinding mappings.toggle "<cmd>TroubleToggle<CR>")
|
||||||
(mkSetLznBinding mappings.toggle "<cmd>TroubleToggle<CR>")
|
(mkSetBinding mappings.workspaceDiagnostics "<cmd>TroubleToggle workspace_diagnostics<CR>")
|
||||||
(mkSetLznBinding mappings.workspaceDiagnostics "<cmd>TroubleToggle workspace_diagnostics<CR>")
|
(mkSetBinding mappings.documentDiagnostics "<cmd>TroubleToggle document_diagnostics<CR>")
|
||||||
(mkSetLznBinding mappings.documentDiagnostics "<cmd>TroubleToggle document_diagnostics<CR>")
|
(mkSetBinding mappings.lspReferences "<cmd>TroubleToggle lsp_references<CR>")
|
||||||
(mkSetLznBinding mappings.lspReferences "<cmd>TroubleToggle lsp_references<CR>")
|
(mkSetBinding mappings.quickfix "<cmd>TroubleToggle quickfix<CR>")
|
||||||
(mkSetLznBinding mappings.quickfix "<cmd>TroubleToggle quickfix<CR>")
|
(mkSetBinding mappings.locList "<cmd>TroubleToggle loclist<CR>")
|
||||||
(mkSetLznBinding mappings.locList "<cmd>TroubleToggle loclist<CR>")
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
binds.whichKey.register = pushDownDefault {
|
binds.whichKey.register = pushDownDefault {
|
||||||
"<leader>l" = "Trouble";
|
"<leader>l" = "Trouble";
|
||||||
"<leader>x" = "+Trouble";
|
"<leader>x" = "+Trouble";
|
||||||
"<leader>lw" = "Workspace";
|
"<leader>lw" = "Workspace";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pluginRC.trouble = entryAnywhere ''
|
||||||
|
-- Enable trouble diagnostics viewer
|
||||||
|
require("trouble").setup {}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
{lib, ...}: let
|
{lib, ...}: let
|
||||||
inherit (lib.options) mkEnableOption;
|
inherit (lib.options) mkEnableOption;
|
||||||
inherit (lib.nvim.binds) mkMappingOption;
|
inherit (lib.nvim.binds) mkMappingOption;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
||||||
in {
|
in {
|
||||||
options.vim.lsp = {
|
options.vim.lsp = {
|
||||||
trouble = {
|
trouble = {
|
||||||
enable = mkEnableOption "trouble diagnostics viewer";
|
enable = mkEnableOption "trouble diagnostics viewer";
|
||||||
|
|
||||||
setupOpts = mkPluginSetupOption "Trouble" {};
|
|
||||||
|
|
||||||
mappings = {
|
mappings = {
|
||||||
toggle = mkMappingOption "Toggle trouble [trouble]" "<leader>xx";
|
toggle = mkMappingOption "Toggle trouble [trouble]" "<leader>xx";
|
||||||
workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
|
workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
|
||||||
|
|
|
||||||
|
|
@ -9,18 +9,9 @@
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
lazy.plugins = {
|
startPlugins = ["luasnip" "cmp-luasnip"] ++ cfg.providers;
|
||||||
luasnip = {
|
autocomplete.nvim-cmp.sources = {luasnip = "[LuaSnip]";};
|
||||||
package = "luasnip";
|
pluginRC.luasnip = cfg.loaders;
|
||||||
lazy = true;
|
|
||||||
after = cfg.loaders;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
startPlugins = cfg.providers;
|
|
||||||
autocomplete.nvim-cmp = {
|
|
||||||
sources = {luasnip = "[LuaSnip]";};
|
|
||||||
sourcePlugins = ["cmp-luasnip"];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,31 +3,39 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.strings) optionalString;
|
inherit (builtins) toJSON;
|
||||||
inherit (lib.lists) optional;
|
inherit (lib.lists) optionals;
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.meta) getExe;
|
inherit (lib.meta) getExe;
|
||||||
inherit (lib.nvim.binds) mkLznBinding;
|
inherit (lib.nvim.binds) mkBinding;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere entryAfter;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
|
|
||||||
cfg = config.vim.terminal.toggleterm;
|
cfg = config.vim.terminal.toggleterm;
|
||||||
lazygitMapDesc = "Open lazygit [toggleterm]";
|
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkMerge [
|
||||||
|
(
|
||||||
|
mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
lazy.plugins.toggleterm-nvim = {
|
startPlugins = [
|
||||||
package = "toggleterm-nvim";
|
"toggleterm-nvim"
|
||||||
cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"];
|
];
|
||||||
keys =
|
|
||||||
[(mkLznBinding ["n"] cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal")]
|
|
||||||
++ optional cfg.lazygit.enable {
|
|
||||||
key = cfg.lazygit.mappings.open;
|
|
||||||
desc = lazygitMapDesc;
|
|
||||||
};
|
|
||||||
|
|
||||||
setupModule = "toggleterm";
|
maps.normal = mkBinding cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal";
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
after = optionalString cfg.lazygit.enable ''
|
pluginRC.toggleterm = entryAnywhere ''
|
||||||
|
require("toggleterm").setup(${toLuaObject cfg.setupOpts})
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
(
|
||||||
|
mkIf (cfg.enable && cfg.lazygit.enable)
|
||||||
|
{
|
||||||
|
vim.startPlugins = optionals (cfg.lazygit.package != null) [
|
||||||
|
cfg.lazygit.package
|
||||||
|
];
|
||||||
|
vim.pluginRC.toggleterm-lazygit = entryAfter ["toggleterm"] ''
|
||||||
local terminal = require 'toggleterm.terminal'
|
local terminal = require 'toggleterm.terminal'
|
||||||
local lazygit = terminal.Terminal:new({
|
local lazygit = terminal.Terminal:new({
|
||||||
cmd = '${
|
cmd = '${
|
||||||
|
|
@ -42,9 +50,9 @@ in {
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.keymap.set('n', ${toLuaObject cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = '${lazygitMapDesc}'})
|
vim.keymap.set('n', ${toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = 'Open lazygit [toggleterm]'})
|
||||||
'';
|
'';
|
||||||
};
|
}
|
||||||
};
|
)
|
||||||
};
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = [cfg.name];
|
startPlugins = [cfg.name];
|
||||||
luaConfigRC.theme = entryBefore ["pluginConfigs" "lazyConfigs"] ''
|
luaConfigRC.theme = entryBefore ["pluginConfigs"] ''
|
||||||
${cfg.extraConfig}
|
${cfg.extraConfig}
|
||||||
${supportedThemes.${cfg.name}.setup {inherit (cfg) style transparent base16-colors;}}
|
${supportedThemes.${cfg.name}.setup {inherit (cfg) style transparent base16-colors;}}
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,13 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.lists) optionals;
|
inherit (lib.lists) optional optionals;
|
||||||
inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings;
|
inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (lib.nvim.dag) entryBefore entryAfter;
|
inherit (lib.nvim.dag) entryBefore entryAfter;
|
||||||
|
|
||||||
cfg = config.vim.treesitter;
|
cfg = config.vim.treesitter;
|
||||||
|
usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
|
||||||
|
|
||||||
self = import ./treesitter.nix {inherit pkgs lib;};
|
self = import ./treesitter.nix {inherit pkgs lib;};
|
||||||
mappingDefinitions = self.options.vim.treesitter.mappings;
|
mappingDefinitions = self.options.vim.treesitter.mappings;
|
||||||
|
|
@ -18,13 +19,9 @@
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["nvim-treesitter"];
|
startPlugins = ["nvim-treesitter"] ++ optional usingNvimCmp "cmp-treesitter";
|
||||||
|
|
||||||
autocomplete.nvim-cmp = {
|
|
||||||
sources = {treesitter = "[Treesitter]";};
|
|
||||||
sourcePlugins = ["cmp-treesitter"];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
autocomplete.nvim-cmp.sources = {treesitter = "[Treesitter]";};
|
||||||
treesitter.grammars = optionals cfg.addDefaultGrammars cfg.defaultGrammars;
|
treesitter.grammars = optionals cfg.addDefaultGrammars cfg.defaultGrammars;
|
||||||
|
|
||||||
maps = {
|
maps = {
|
||||||
|
|
|
||||||
|
|
@ -4,18 +4,15 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
|
||||||
cfg = config.vim.binds.cheatsheet;
|
cfg = config.vim.binds.cheatsheet;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim.lazy.plugins.cheatsheet-nvim = {
|
vim.startPlugins = ["cheatsheet-nvim"];
|
||||||
package = "cheatsheet-nvim";
|
|
||||||
setupModule = "cheatsheet";
|
|
||||||
setupOpts = {};
|
|
||||||
cmd = ["Cheatsheet" "CheatsheetEdit"];
|
|
||||||
|
|
||||||
before = optionalString config.vim.lazy.enable "require('lz.n').trigger_load('telescope')";
|
vim.pluginRC.cheaetsheet-nvim = entryAnywhere ''
|
||||||
};
|
require('cheatsheet').setup({})
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,9 @@
|
||||||
cfg = config.vim.utility.diffview-nvim;
|
cfg = config.vim.utility.diffview-nvim;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim.startPlugins = [
|
||||||
startPlugins = ["plenary-nvim"];
|
"diffview-nvim"
|
||||||
lazy.plugins.diffview-nvim = {
|
"plenary-nvim"
|
||||||
package = "diffview-nvim";
|
];
|
||||||
cmd = ["DiffviewClose" "DiffviewFileHistory" "DiffviewFocusFiles" "DiffviewLog" "DiffviewOpen" "DiffviewRefresh" "DiffviewToggleFiles"];
|
|
||||||
setupModule = "diffview";
|
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
{lib, ...}: let
|
{lib, ...}: let
|
||||||
inherit (lib.options) mkEnableOption;
|
inherit (lib.options) mkEnableOption;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
||||||
in {
|
in {
|
||||||
options.vim.utility.diffview-nvim = {
|
options.vim.utility.diffview-nvim = {
|
||||||
enable = mkEnableOption "diffview-nvim: cycle through diffs for all modified files for any git rev";
|
enable = mkEnableOption "diffview-nvim: cycle through diffs for all modified files for any git rev";
|
||||||
setupOpts = mkPluginSetupOption "Fidget" {};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,20 +4,20 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
|
||||||
cfg = config.vim.utility.icon-picker;
|
cfg = config.vim.utility.icon-picker;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim.startPlugins = ["dressing-nvim"];
|
vim.startPlugins = [
|
||||||
|
"icon-picker-nvim"
|
||||||
|
"dressing-nvim"
|
||||||
|
];
|
||||||
|
|
||||||
vim.lazy.plugins.icon-picker-nvim = {
|
vim.pluginRC.icon-picker = entryAnywhere ''
|
||||||
package = "icon-picker-nvim";
|
require("icon-picker").setup({
|
||||||
setupModule = "icon-picker";
|
disable_legacy_commands = true
|
||||||
setupOpts = {
|
})
|
||||||
disable_legacy_commands = true;
|
'';
|
||||||
};
|
|
||||||
|
|
||||||
cmd = ["IconPickerInsert" "IconPickerNormal" "IconPickerYank"];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,25 +3,43 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf mkDefault;
|
inherit (lib.modules) mkIf mkMerge mkDefault;
|
||||||
inherit (lib.nvim.binds) mkLznBinding;
|
inherit (lib.nvim.binds) mkBinding;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
|
||||||
cfg = config.vim.utility.motion.leap;
|
cfg = config.vim.utility.motion.leap;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim.startPlugins = [
|
||||||
startPlugins = ["vim-repeat"];
|
"leap-nvim"
|
||||||
lazy.plugins.leap-nvim = {
|
"vim-repeat"
|
||||||
package = "leap-nvim";
|
|
||||||
keys = [
|
|
||||||
(mkLznBinding ["n" "o" "x"] cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
|
|
||||||
(mkLznBinding ["n" "o" "x"] cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
|
|
||||||
(mkLznBinding ["n" "o" "x"] cfg.mappings.leapForwardTill "<Plug>(leap-forward-till)" "Leap forward till")
|
|
||||||
(mkLznBinding ["n" "o" "x"] cfg.mappings.leapBackwardTill "<Plug>(leap-backward-till)" "Leap backward till")
|
|
||||||
(mkLznBinding ["n" "o" "x"] cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
|
|
||||||
];
|
];
|
||||||
|
|
||||||
after = ''
|
vim.maps.normal = mkMerge [
|
||||||
|
(mkBinding cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
|
||||||
|
(mkBinding cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
|
||||||
|
(mkBinding cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
|
||||||
|
];
|
||||||
|
|
||||||
|
vim.maps.operator = mkMerge [
|
||||||
|
(mkBinding cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
|
||||||
|
(mkBinding cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
|
||||||
|
(mkBinding cfg.mappings.leapForwardTill "<Plug>(leap-forward-till)" "Leap forward till")
|
||||||
|
(mkBinding cfg.mappings.leapBackwardTill "<Plug>(leap-backward-till)" "Leap backward till")
|
||||||
|
(mkBinding cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
|
||||||
|
];
|
||||||
|
|
||||||
|
vim.maps.visualOnly = mkMerge [
|
||||||
|
(mkBinding cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
|
||||||
|
(mkBinding cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
|
||||||
|
(mkBinding cfg.mappings.leapForwardTill "<Plug>(leap-forward-till)" "Leap forward till")
|
||||||
|
(mkBinding cfg.mappings.leapBackwardTill "<Plug>(leap-backward-till)" "Leap backward till")
|
||||||
|
(mkBinding cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
|
||||||
|
];
|
||||||
|
|
||||||
|
vim.binds.whichKey.register."<leader>s" = mkDefault "+Leap";
|
||||||
|
|
||||||
|
vim.pluginRC.leap-nvim = entryAnywhere ''
|
||||||
require('leap').opts = {
|
require('leap').opts = {
|
||||||
max_phase_one_targets = nil,
|
max_phase_one_targets = nil,
|
||||||
highlight_unlabeled_phase_one_targets = false,
|
highlight_unlabeled_phase_one_targets = false,
|
||||||
|
|
@ -54,8 +72,4 @@ in {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
binds.whichKey.register."<leader>s" = mkDefault "+Leap";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,47 +8,24 @@
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
|
|
||||||
cfg = config.vim.utility.surround;
|
cfg = config.vim.utility.surround;
|
||||||
mkLznKey = mode: key: {
|
|
||||||
inherit key mode;
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["nvim-surround"];
|
startPlugins = ["nvim-surround"];
|
||||||
pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
|
pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
|
||||||
|
|
||||||
lazy.plugins.nvim-surround = {
|
utility.surround.setupOpts.keymaps = mkIf cfg.useVendoredKeybindings {
|
||||||
package = "nvim-surround";
|
insert = "<C-g>z";
|
||||||
setupModule = "nvim-surround";
|
insert_line = "<C-g>Z";
|
||||||
inherit (cfg) setupOpts;
|
normal = "gz";
|
||||||
|
normal_cur = "gZ";
|
||||||
keys =
|
normal_line = "gzz";
|
||||||
[
|
normal_cur_line = "gZZ";
|
||||||
(mkLznKey ["i"] cfg.setupOpts.keymaps.insert)
|
visual = "gz";
|
||||||
(mkLznKey ["i"] cfg.setupOpts.keymaps.insert_line)
|
visual_line = "gZ";
|
||||||
(mkLznKey ["x"] cfg.setupOpts.keymaps.visual)
|
delete = "gzd";
|
||||||
(mkLznKey ["x"] cfg.setupOpts.keymaps.visual_line)
|
change = "gzr";
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal)
|
change_line = "gZR";
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur)
|
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal_line)
|
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur_line)
|
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.delete)
|
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.change)
|
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.change_line)
|
|
||||||
]
|
|
||||||
++ map (mkLznKey ["n" "i" "v"]) [
|
|
||||||
"<Plug>(nvim-surround-insert)"
|
|
||||||
"<Plug>(nvim-surround-insert-line)"
|
|
||||||
"<Plug>(nvim-surround-normal)"
|
|
||||||
"<Plug>(nvim-surround-normal-cur)"
|
|
||||||
"<Plug>(nvim-surround-normal-line)"
|
|
||||||
"<Plug>(nvim-surround-normal-cur-line)"
|
|
||||||
"<Plug>(nvim-surround-visual)"
|
|
||||||
"<Plug>(nvim-surround-visual-line)"
|
|
||||||
"<Plug>(nvim-surround-delete)"
|
|
||||||
"<Plug>(nvim-surround-change)"
|
|
||||||
"<Plug>(nvim-surround-change-line)"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,7 @@
|
||||||
{
|
{lib, ...}: let
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib.options) mkOption;
|
inherit (lib.options) mkOption;
|
||||||
inherit (lib.types) bool str;
|
inherit (lib.types) bool;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
inherit (lib.nvim.types) mkPluginSetupOption;
|
||||||
|
|
||||||
cfg = config.vim.utility.surround;
|
|
||||||
vendoredKeybinds = {
|
|
||||||
insert = "<C-g>z";
|
|
||||||
insert_line = "<C-g>Z";
|
|
||||||
normal = "gz";
|
|
||||||
normal_cur = "gZ";
|
|
||||||
normal_line = "gzz";
|
|
||||||
normal_cur_line = "gZZ";
|
|
||||||
visual = "gz";
|
|
||||||
visual_line = "gZ";
|
|
||||||
delete = "gzd";
|
|
||||||
change = "gzr";
|
|
||||||
change_line = "gZR";
|
|
||||||
};
|
|
||||||
|
|
||||||
mkKeymapOption = name: default:
|
|
||||||
mkOption {
|
|
||||||
description = "keymap for ${name}";
|
|
||||||
type = str;
|
|
||||||
default =
|
|
||||||
if cfg.useVendoredKeybindings
|
|
||||||
then vendoredKeybinds.${name}
|
|
||||||
else default;
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
options.vim.utility.surround = {
|
options.vim.utility.surround = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
|
|
@ -42,21 +13,7 @@ in {
|
||||||
with nvim-leap.
|
with nvim-leap.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
setupOpts = mkPluginSetupOption "nvim-surround" {
|
setupOpts = mkPluginSetupOption "nvim-surround" {};
|
||||||
keymaps = {
|
|
||||||
insert = mkKeymapOption "insert" "<C-g>s";
|
|
||||||
insert_line = mkKeymapOption "insert_line" "<C-g>S";
|
|
||||||
normal = mkKeymapOption "normal" "ys";
|
|
||||||
normal_cur = mkKeymapOption "normal_cur" "yss";
|
|
||||||
normal_line = mkKeymapOption "normal_line" "yS";
|
|
||||||
normal_cur_line = mkKeymapOption "normal_cur_line" "ySS";
|
|
||||||
visual = mkKeymapOption "visual" "S";
|
|
||||||
visual_line = mkKeymapOption "visual_line" "gS";
|
|
||||||
delete = mkKeymapOption "delete" "ds";
|
|
||||||
change = mkKeymapOption "change" "cs";
|
|
||||||
change_line = mkKeymapOption "change_line" "cS";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
useVendoredKeybindings = mkOption {
|
useVendoredKeybindings = mkOption {
|
||||||
type = bool;
|
type = bool;
|
||||||
|
|
|
||||||
|
|
@ -1,72 +1,63 @@
|
||||||
{
|
{
|
||||||
options,
|
|
||||||
config,
|
config,
|
||||||
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.nvim.binds) addDescriptionsToMappings;
|
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
|
||||||
inherit (lib.strings) optionalString;
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
inherit (lib.lists) optionals;
|
inherit (lib.nvim.binds) pushDownDefault;
|
||||||
inherit (lib.nvim.binds) pushDownDefault mkSetLznBinding;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
|
|
||||||
cfg = config.vim.telescope;
|
cfg = config.vim.telescope;
|
||||||
mappingDefinitions = options.vim.telescope.mappings;
|
self = import ./telescope.nix {inherit pkgs lib;};
|
||||||
|
mappingDefinitions = self.options.vim.telescope.mappings;
|
||||||
|
|
||||||
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
|
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["plenary-nvim"];
|
startPlugins = [
|
||||||
|
"telescope"
|
||||||
|
"plenary-nvim"
|
||||||
|
];
|
||||||
|
|
||||||
lazy.plugins.telescope = {
|
maps.normal = mkMerge [
|
||||||
package = "telescope";
|
(mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
|
||||||
setupModule = "telescope";
|
(mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
|
||||||
inherit (cfg) setupOpts;
|
(mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
|
||||||
after = ''
|
(mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
|
||||||
local telescope = require("telescope")
|
(mkSetBinding mappings.open "<cmd> Telescope<CR>")
|
||||||
${optionalString config.vim.ui.noice.enable "telescope.load_extension('noice')"}
|
(mkSetBinding mappings.resume "<cmd> Telescope resume<CR>")
|
||||||
${optionalString config.vim.notify.nvim-notify.enable "telescope.load_extension('notify')"}
|
|
||||||
${optionalString config.vim.projects.project-nvim.enable "telescope.load_extension('projects')"}
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmd = ["Telescope"];
|
(mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
|
||||||
|
(mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
|
||||||
|
(mkSetBinding mappings.gitBranches "<cmd> Telescope git_branches<CR>")
|
||||||
|
(mkSetBinding mappings.gitStatus "<cmd> Telescope git_status<CR>")
|
||||||
|
(mkSetBinding mappings.gitStash "<cmd> Telescope git_stash<CR>")
|
||||||
|
|
||||||
keys =
|
(mkIf config.vim.lsp.enable (mkMerge [
|
||||||
[
|
(mkSetBinding mappings.lspDocumentSymbols "<cmd> Telescope lsp_document_symbols<CR>")
|
||||||
(mkSetLznBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
|
(mkSetBinding mappings.lspWorkspaceSymbols "<cmd> Telescope lsp_workspace_symbols<CR>")
|
||||||
(mkSetLznBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
|
|
||||||
(mkSetLznBinding mappings.buffers "<cmd> Telescope buffers<CR>")
|
|
||||||
(mkSetLznBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
|
|
||||||
(mkSetLznBinding mappings.open "<cmd> Telescope<CR>")
|
|
||||||
|
|
||||||
(mkSetLznBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
|
(mkSetBinding mappings.lspReferences "<cmd> Telescope lsp_references<CR>")
|
||||||
(mkSetLznBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
|
(mkSetBinding mappings.lspImplementations "<cmd> Telescope lsp_implementations<CR>")
|
||||||
(mkSetLznBinding mappings.gitBranches "<cmd> Telescope git_branches<CR>")
|
(mkSetBinding mappings.lspDefinitions "<cmd> Telescope lsp_definitions<CR>")
|
||||||
(mkSetLznBinding mappings.gitStatus "<cmd> Telescope git_status<CR>")
|
(mkSetBinding mappings.lspTypeDefinitions "<cmd> Telescope lsp_type_definitions<CR>")
|
||||||
(mkSetLznBinding mappings.gitStash "<cmd> Telescope git_stash<CR>")
|
(mkSetBinding mappings.diagnostics "<cmd> Telescope diagnostics<CR>")
|
||||||
]
|
]))
|
||||||
++ (optionals config.vim.lsp.enable [
|
|
||||||
(mkSetLznBinding mappings.lspDocumentSymbols "<cmd> Telescope lsp_document_symbols<CR>")
|
|
||||||
(mkSetLznBinding mappings.lspWorkspaceSymbols "<cmd> Telescope lsp_workspace_symbols<CR>")
|
|
||||||
|
|
||||||
(mkSetLznBinding mappings.lspReferences "<cmd> Telescope lsp_references<CR>")
|
(
|
||||||
(mkSetLznBinding mappings.lspImplementations "<cmd> Telescope lsp_implementations<CR>")
|
mkIf config.vim.treesitter.enable
|
||||||
(mkSetLznBinding mappings.lspDefinitions "<cmd> Telescope lsp_definitions<CR>")
|
(mkSetBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
|
||||||
(mkSetLznBinding mappings.lspTypeDefinitions "<cmd> Telescope lsp_type_definitions<CR>")
|
|
||||||
(mkSetLznBinding mappings.diagnostics "<cmd> Telescope diagnostics<CR>")
|
|
||||||
])
|
|
||||||
++ (
|
|
||||||
optionals config.vim.treesitter.enable [
|
|
||||||
(mkSetLznBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
|
|
||||||
]
|
|
||||||
)
|
)
|
||||||
++ (
|
|
||||||
optionals config.vim.projects.project-nvim.enable [
|
(
|
||||||
(mkSetLznBinding mappings.findProjects "<cmd Telescope projects<CR>")
|
mkIf config.vim.projects.project-nvim.enable
|
||||||
]
|
(mkSetBinding mappings.findProjects "<cmd> Telescope projects<CR>")
|
||||||
);
|
)
|
||||||
};
|
];
|
||||||
|
|
||||||
binds.whichKey.register = pushDownDefault {
|
binds.whichKey.register = pushDownDefault {
|
||||||
"<leader>f" = "+Telescope";
|
"<leader>f" = "+Telescope";
|
||||||
|
|
@ -75,6 +66,29 @@ in {
|
||||||
"<leader>fv" = "Telescope Git";
|
"<leader>fv" = "Telescope Git";
|
||||||
"<leader>fvc" = "Commits";
|
"<leader>fvc" = "Commits";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pluginRC.telescope = entryAnywhere ''
|
||||||
|
local telescope = require('telescope')
|
||||||
|
telescope.setup(${toLuaObject cfg.setupOpts})
|
||||||
|
|
||||||
|
${
|
||||||
|
if config.vim.ui.noice.enable
|
||||||
|
then "telescope.load_extension('noice')"
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
|
||||||
|
${
|
||||||
|
if config.vim.notify.nvim-notify.enable
|
||||||
|
then "telescope.load_extension('notify')"
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
|
||||||
|
${
|
||||||
|
if config.vim.projects.project-nvim.enable
|
||||||
|
then "telescope.load_extension('projects')"
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,16 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
|
|
||||||
cfg = config.vim.visuals.fidget-nvim;
|
cfg = config.vim.visuals.fidget-nvim;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim.lazy.plugins.fidget-nvim = {
|
vim.startPlugins = ["fidget-nvim"];
|
||||||
package = "fidget-nvim";
|
|
||||||
setupModule = "fidget";
|
vim.pluginRC.fidget-nvim = entryAnywhere ''
|
||||||
event = "LspAttach";
|
require'fidget'.setup(${toLuaObject cfg.setupOpts})
|
||||||
inherit (cfg) setupOpts;
|
'';
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,108 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (builtins) toJSON typeOf head length filter concatLists concatStringsSep;
|
|
||||||
inherit (lib.attrsets) mapAttrsToList;
|
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
|
||||||
inherit (lib.generators) mkLuaInline;
|
|
||||||
inherit (lib.strings) optionalString;
|
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
|
||||||
inherit (lib.nvim.dag) entryBefore entryAfter;
|
|
||||||
cfg = config.vim.lazy;
|
|
||||||
|
|
||||||
toLuaLznKeySpec = keySpec:
|
|
||||||
(removeAttrs keySpec ["key" "lua" "action"])
|
|
||||||
// {
|
|
||||||
"@1" = keySpec.key;
|
|
||||||
"@2" =
|
|
||||||
if keySpec.lua
|
|
||||||
then mkLuaInline keySpec.action
|
|
||||||
else keySpec.action;
|
|
||||||
};
|
|
||||||
|
|
||||||
toLuaLznSpec = name: spec:
|
|
||||||
(removeAttrs spec ["package" "setupModule" "setupOpts" "keys"])
|
|
||||||
// {
|
|
||||||
"@1" = name;
|
|
||||||
before =
|
|
||||||
if spec.before != null
|
|
||||||
then
|
|
||||||
mkLuaInline ''
|
|
||||||
function()
|
|
||||||
${spec.before}
|
|
||||||
end
|
|
||||||
''
|
|
||||||
else null;
|
|
||||||
|
|
||||||
after =
|
|
||||||
if spec.setupModule == null && spec.after == null
|
|
||||||
then null
|
|
||||||
else
|
|
||||||
mkLuaInline ''
|
|
||||||
function()
|
|
||||||
${
|
|
||||||
optionalString (spec.setupModule != null)
|
|
||||||
"require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
|
|
||||||
}
|
|
||||||
${optionalString (spec.after != null) spec.after}
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
|
|
||||||
keys =
|
|
||||||
if typeOf spec.keys == "list" && length spec.keys > 0 && typeOf (head spec.keys) == "set"
|
|
||||||
then map toLuaLznKeySpec (filter (keySpec: keySpec.key != null) spec.keys)
|
|
||||||
# empty list or str or (listOf str)
|
|
||||||
else spec.keys;
|
|
||||||
};
|
|
||||||
lznSpecs = mapAttrsToList toLuaLznSpec cfg.plugins;
|
|
||||||
|
|
||||||
pluginPackages = mapAttrsToList (_: plugin: plugin.package) cfg.plugins;
|
|
||||||
|
|
||||||
specToNotLazyConfig = _: spec: ''
|
|
||||||
do
|
|
||||||
${optionalString (spec.before != null) spec.before}
|
|
||||||
${optionalString (spec.setupModule != null)
|
|
||||||
"require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"}
|
|
||||||
${optionalString (spec.after != null) spec.after}
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
|
|
||||||
specToKeymaps = _: spec:
|
|
||||||
if typeOf spec.keys == "list"
|
|
||||||
then map (x: removeAttrs x ["ft"]) (filter (lznKey: lznKey.action != null && lznKey.ft == null) spec.keys)
|
|
||||||
else if spec.keys == null || typeOf spec.keys == "string"
|
|
||||||
then []
|
|
||||||
else [spec.keys];
|
|
||||||
|
|
||||||
notLazyConfig =
|
|
||||||
concatStringsSep "\n"
|
|
||||||
(mapAttrsToList specToNotLazyConfig cfg.plugins);
|
|
||||||
|
|
||||||
beforeAllJoined =
|
|
||||||
concatStringsSep "\n"
|
|
||||||
(filter (x: x != null) (mapAttrsToList (_: spec: spec.beforeAll) cfg.plugins));
|
|
||||||
in {
|
|
||||||
config.vim = mkMerge [
|
|
||||||
(mkIf cfg.enable {
|
|
||||||
startPlugins = ["lz-n" "lzn-auto-require"];
|
|
||||||
|
|
||||||
optPlugins = pluginPackages;
|
|
||||||
|
|
||||||
lazy.builtLazyConfig = ''
|
|
||||||
require('lz.n').load(${toLuaObject lznSpecs})
|
|
||||||
${optionalString cfg.enableLznAutoRequire "require('lzn-auto-require').enable()"}
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
|
|
||||||
(mkIf (!cfg.enable) {
|
|
||||||
startPlugins = pluginPackages;
|
|
||||||
lazy.builtLazyConfig = ''
|
|
||||||
${beforeAllJoined}
|
|
||||||
${notLazyConfig}
|
|
||||||
'';
|
|
||||||
keymaps = concatLists (mapAttrsToList specToKeymaps cfg.plugins);
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./lazy.nix
|
|
||||||
./config.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,237 +0,0 @@
|
||||||
{lib, ...}: let
|
|
||||||
inherit (lib.options) mkOption mkEnableOption;
|
|
||||||
inherit (lib.types) enum listOf submodule nullOr str bool int attrsOf anything either oneOf lines;
|
|
||||||
inherit (lib.nvim.types) pluginType;
|
|
||||||
inherit (lib.nvim.config) mkBool;
|
|
||||||
|
|
||||||
lznKeysSpec = submodule {
|
|
||||||
options = {
|
|
||||||
key = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
description = "Key to bind to. If key is null this entry is ignored.";
|
|
||||||
};
|
|
||||||
|
|
||||||
action = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
description = "Action to trigger.";
|
|
||||||
};
|
|
||||||
lua = mkBool false ''
|
|
||||||
If true, `action` is considered to be lua code.
|
|
||||||
Thus, it will not be wrapped in `""`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
desc = mkOption {
|
|
||||||
description = "Description of the key map";
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
ft = mkOption {
|
|
||||||
description = "TBD";
|
|
||||||
type = nullOr (listOf str);
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
mode = mkOption {
|
|
||||||
description = "Modes to bind in";
|
|
||||||
type = either str (listOf str);
|
|
||||||
default = ["n" "x" "s" "o"];
|
|
||||||
};
|
|
||||||
|
|
||||||
silent = mkBool true "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
|
|
||||||
nowait = mkBool false "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
|
|
||||||
script = mkBool false "Equivalent to adding <script> to a map.";
|
|
||||||
expr = mkBool false "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
|
|
||||||
unique = mkBool false "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
|
|
||||||
noremap = mkBool true "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
lznPluginType = submodule {
|
|
||||||
options = {
|
|
||||||
package = mkOption {
|
|
||||||
type = pluginType;
|
|
||||||
description = "Plugin package";
|
|
||||||
};
|
|
||||||
|
|
||||||
setupModule = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
description = "Lua module to run setup function on.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
setupOpts = mkOption {
|
|
||||||
type = submodule {freeformType = attrsOf anything;};
|
|
||||||
description = "Options to pass to the setup function";
|
|
||||||
default = {};
|
|
||||||
};
|
|
||||||
|
|
||||||
# lz.n options
|
|
||||||
|
|
||||||
enabled = mkOption {
|
|
||||||
type = nullOr (either bool str);
|
|
||||||
description = "When false, or if the lua function returns false, this plugin will not be included in the spec";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeAll = mkOption {
|
|
||||||
type = nullOr lines;
|
|
||||||
description = "Lua code to run before any plugins are loaded. This will be wrapped in a function.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
before = mkOption {
|
|
||||||
type = nullOr lines;
|
|
||||||
description = "Lua code to run before plugin is loaded. This will be wrapped in a function.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
after = mkOption {
|
|
||||||
type = nullOr lines;
|
|
||||||
description = ''
|
|
||||||
Lua code to run after plugin is loaded. This will be wrapped in a function.
|
|
||||||
|
|
||||||
If [](#opt-vim.lazy.plugins._name_.setupModule) is provided, the setup will be ran before `after`.
|
|
||||||
'';
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
event = mkOption {
|
|
||||||
description = "Lazy-load on event";
|
|
||||||
default = null;
|
|
||||||
type = let
|
|
||||||
event = submodule {
|
|
||||||
options = {
|
|
||||||
event = mkOption {
|
|
||||||
type = nullOr (either str (listOf str));
|
|
||||||
description = "Exact event name";
|
|
||||||
example = "BufEnter";
|
|
||||||
};
|
|
||||||
pattern = mkOption {
|
|
||||||
type = nullOr (either str (listOf str));
|
|
||||||
description = "Event pattern";
|
|
||||||
example = "BufEnter *.lua";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
nullOr (oneOf [str (listOf str) event]);
|
|
||||||
};
|
|
||||||
|
|
||||||
cmd = mkOption {
|
|
||||||
description = "Lazy-load on command";
|
|
||||||
default = null;
|
|
||||||
type = nullOr (either str (listOf str));
|
|
||||||
};
|
|
||||||
|
|
||||||
ft = mkOption {
|
|
||||||
description = "Lazy-load on filetype";
|
|
||||||
default = null;
|
|
||||||
type = nullOr (either str (listOf str));
|
|
||||||
};
|
|
||||||
|
|
||||||
keys = mkOption {
|
|
||||||
description = "Lazy-load on key mapping";
|
|
||||||
default = null;
|
|
||||||
type = nullOr (oneOf [str (listOf lznKeysSpec) (listOf str)]);
|
|
||||||
example = ''
|
|
||||||
keys = [
|
|
||||||
{
|
|
||||||
mode = "n";
|
|
||||||
key = "<leader>s";
|
|
||||||
action = ":DapStepOver<cr>";
|
|
||||||
desc = "DAP Step Over";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
mode = ["n", "x"];
|
|
||||||
key = "<leader>dc";
|
|
||||||
action = "function() require('dap').continue() end";
|
|
||||||
lua = true;
|
|
||||||
desc = "DAP Continue";
|
|
||||||
}
|
|
||||||
]
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
colorscheme = mkOption {
|
|
||||||
description = "Lazy-load on colorscheme.";
|
|
||||||
type = nullOr (either str (listOf str));
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
lazy = mkBool false "Lazy-load manually, e.g. using `trigger_load`.";
|
|
||||||
|
|
||||||
priority = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
description = "Only useful for stat plugins (not lazy-loaded) to force loading certain plugins first.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
load = mkOption {
|
|
||||||
type = nullOr lines;
|
|
||||||
default = null;
|
|
||||||
description = ''
|
|
||||||
Lua code to override the `vim.g.lz_n.load()` function for a single plugin.
|
|
||||||
|
|
||||||
This will be wrapped in a function.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options.vim.lazy = {
|
|
||||||
enable = mkEnableOption "plugin lazy-loading via lz.n and lzn-auto-require" // {default = true;};
|
|
||||||
loader = mkOption {
|
|
||||||
description = "Lazy loader to use";
|
|
||||||
type = enum ["lz.n"];
|
|
||||||
default = "lz.n";
|
|
||||||
};
|
|
||||||
|
|
||||||
plugins = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = attrsOf lznPluginType;
|
|
||||||
description = ''
|
|
||||||
Plugins to lazy load.
|
|
||||||
|
|
||||||
The attribute key is used as the plugin name: for the default `vim.g.lz_n.load`
|
|
||||||
function this should be either the `package.pname` or `package.name`.
|
|
||||||
'';
|
|
||||||
example = ''
|
|
||||||
{
|
|
||||||
toggleterm-nvim = {
|
|
||||||
package = "toggleterm-nvim";
|
|
||||||
setupModule = "toggleterm";
|
|
||||||
setupOpts = cfg.setupOpts;
|
|
||||||
|
|
||||||
after = "require('toggleterm').do_something()";
|
|
||||||
cmd = ["ToggleTerm"];
|
|
||||||
};
|
|
||||||
|
|
||||||
$${pkgs.vimPlugins.vim-bbye.pname} = {
|
|
||||||
package = pkgs.vimPlugins.vim-bbye;
|
|
||||||
cmd = ["Bdelete" "Bwipeout"];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
enableLznAutoRequire = mkOption {
|
|
||||||
description = ''
|
|
||||||
Enable lzn-auto-require. Since builtin plugins rely on this, only turn
|
|
||||||
off for debugging.
|
|
||||||
'';
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
builtLazyConfig = mkOption {
|
|
||||||
internal = true;
|
|
||||||
type = lines;
|
|
||||||
description = ''
|
|
||||||
The built config for lz.n, or if `vim.lazy.enable` is false, the
|
|
||||||
individual plugin configs.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
}: let
|
}: let
|
||||||
inherit (builtins) map mapAttrs filter;
|
inherit (builtins) map mapAttrs filter;
|
||||||
inherit (lib.attrsets) mapAttrsToList;
|
inherit (lib.attrsets) mapAttrsToList;
|
||||||
inherit (lib.strings) concatLines concatMapStringsSep optionalString;
|
inherit (lib.strings) concatLines concatMapStringsSep;
|
||||||
inherit (lib.trivial) showWarnings;
|
inherit (lib.trivial) showWarnings;
|
||||||
inherit (lib.generators) mkLuaInline;
|
inherit (lib.generators) mkLuaInline;
|
||||||
inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
|
inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
|
||||||
|
|
@ -52,8 +52,7 @@ in {
|
||||||
optionsScript = entryAfter ["basic"] (concatLines optionsScript);
|
optionsScript = entryAfter ["basic"] (concatLines optionsScript);
|
||||||
|
|
||||||
# Basic
|
# Basic
|
||||||
lazyConfigs = entryAfter ["optionsScript"] cfg.lazy.builtLazyConfig;
|
pluginConfigs = entryAfter ["optionsScript"] pluginConfigs;
|
||||||
pluginConfigs = entryAfter ["lazyConfigs"] pluginConfigs;
|
|
||||||
extraPluginConfigs = entryAfter ["pluginConfigs"] extraPluginConfigs;
|
extraPluginConfigs = entryAfter ["pluginConfigs"] extraPluginConfigs;
|
||||||
mappings = entryAfter ["extraPluginConfigs"] keymaps;
|
mappings = entryAfter ["extraPluginConfigs"] keymaps;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue