mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-16 15:30:50 +00:00
Compare commits
3 commits
26567dffef
...
df14086eef
| Author | SHA1 | Date | |
|---|---|---|---|
|
df14086eef |
|||
|
6b98217df8 |
|||
|
7d8e2f7669 |
5 changed files with 189 additions and 7 deletions
152
modules/neovim/init/autocommands.nix
Normal file
152
modules/neovim/init/autocommands.nix
Normal file
|
|
@ -0,0 +1,152 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (lib.options) mkOption mkEnableOption;
|
||||||
|
inherit (lib.types) submodule attrsOf listOf str bool;
|
||||||
|
inherit (lib.nvim.types) luaInline;
|
||||||
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
|
inherit (lib.nvim.dag) entryAfter;
|
||||||
|
|
||||||
|
autocommandType = submodule {
|
||||||
|
options = {
|
||||||
|
enable =
|
||||||
|
mkEnableOption ""
|
||||||
|
// {
|
||||||
|
default = true;
|
||||||
|
description = "Whether to enable this autocommand";
|
||||||
|
};
|
||||||
|
|
||||||
|
event = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
example = ["BufRead" "BufWritePre"];
|
||||||
|
description = "The event(s) that trigger the autocommand.";
|
||||||
|
};
|
||||||
|
|
||||||
|
pattern = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
example = ["*.lua" "*.vim"];
|
||||||
|
description = "The file pattern(s) that determine when the autocommand applies).";
|
||||||
|
};
|
||||||
|
|
||||||
|
callback = mkOption {
|
||||||
|
type = luaInline;
|
||||||
|
example = ''
|
||||||
|
function()
|
||||||
|
print("Saving a Lua file...")
|
||||||
|
end,
|
||||||
|
'';
|
||||||
|
description = "The file pattern(s) that determine when the autocommand applies).";
|
||||||
|
};
|
||||||
|
|
||||||
|
command = mkOption {
|
||||||
|
type = str;
|
||||||
|
description = "Vim command string instead of a Lua function.";
|
||||||
|
};
|
||||||
|
|
||||||
|
group = mkOption {
|
||||||
|
type = str;
|
||||||
|
example = "MyAutoCmdGroup";
|
||||||
|
description = "An optional autocommand group to manage related autocommands.";
|
||||||
|
};
|
||||||
|
|
||||||
|
desc = mkOption {
|
||||||
|
type = str;
|
||||||
|
example = "Notify when saving a Lua file";
|
||||||
|
description = "A description for the autocommand.";
|
||||||
|
};
|
||||||
|
|
||||||
|
once = mkOption {
|
||||||
|
type = bool;
|
||||||
|
default = false;
|
||||||
|
description = "Whether autocommand run only once.";
|
||||||
|
};
|
||||||
|
|
||||||
|
nested = mkOption {
|
||||||
|
type = bool;
|
||||||
|
default = false;
|
||||||
|
description = "Whether to allow nested autocommands to trigger.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
autogroupType = submodule {
|
||||||
|
options = {
|
||||||
|
name = mkOption {
|
||||||
|
type = str;
|
||||||
|
example = "MyAutoCmdGroup";
|
||||||
|
description = "The name of the autocommand group.";
|
||||||
|
};
|
||||||
|
|
||||||
|
clear = mkOption {
|
||||||
|
type = bool;
|
||||||
|
default = true;
|
||||||
|
description = ''
|
||||||
|
Whether to clear existing autocommands in this group before defining new ones.
|
||||||
|
This helps avoid duplicate autocommands.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
cfg = config.vim;
|
||||||
|
in {
|
||||||
|
options.vim = {
|
||||||
|
autogroups = mkOption {
|
||||||
|
type = listOf autogroupType;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
A list of Neovim autogroups, which are used to organize and manage related
|
||||||
|
autocommands together. Groups allow multiple autocommands to be cleared
|
||||||
|
or redefined collectively, preventing duplicate definitions.
|
||||||
|
|
||||||
|
Each autogroup consists of a name, a boolean indicating whether to clear
|
||||||
|
existing autocommands, and a list of associated autocommands.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
autocommands = mkOption {
|
||||||
|
type = listOf autocommandType;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
A list of Neovim autocommands to be registered. Each entry defines an
|
||||||
|
autocommand, specifying events, patterns, and optional callbacks, commands,
|
||||||
|
groups, and execution settings.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config.vim = let
|
||||||
|
enabledAutocommands = lib.filter (cmd: cmd.enable) cfg.autocommands;
|
||||||
|
in {
|
||||||
|
luaConfigRC = {
|
||||||
|
autogroups = entryAfter ["pluginConfigs"] (lib.optionalString (enabledAutocommands != []) ''
|
||||||
|
local nvf_autogroups = ${toLuaObject cfg.autogroups}
|
||||||
|
|
||||||
|
for group_name, options in pairs(nvf_autogroups) do
|
||||||
|
vim.api.nvim_create_augroup(group_name, options)
|
||||||
|
end
|
||||||
|
'');
|
||||||
|
|
||||||
|
autocommands = entryAfter ["pluginConfigs"] (lib.optionalString (cfg.autocommands != []) ''
|
||||||
|
local nvf_autocommands = ${toLuaObject enabledAutocommands}
|
||||||
|
for _, autocmd in ipairs(nvf_autocommands) do
|
||||||
|
vim.api.nvim_create_autocmd(
|
||||||
|
autocmd.event,
|
||||||
|
{
|
||||||
|
group = autocmd.group,
|
||||||
|
pattern = autocmd.pattern,
|
||||||
|
buffer = autocmd.buffer,
|
||||||
|
desc = autocmd.desc,
|
||||||
|
callback = autocmd.callback,
|
||||||
|
command = autocmd.command,
|
||||||
|
once = autocmd.once,
|
||||||
|
nested = autocmd.nested
|
||||||
|
}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
'');
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./autocommands.nix
|
||||||
./basic.nix
|
./basic.nix
|
||||||
./debug.nix
|
./debug.nix
|
||||||
./highlight.nix
|
./highlight.nix
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,30 @@ in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["nvim-lint"];
|
startPlugins = ["nvim-lint"];
|
||||||
pluginRC.nvim-lint = entryAnywhere ''
|
pluginRC.nvim-lint = let
|
||||||
require("lint").setup(${toLuaObject cfg.setupOpts})
|
mappedLinters =
|
||||||
|
lib.concatMapAttrsStringSep "\n" (name: value: ''
|
||||||
|
local linter_${name} = lint.linters.${name}
|
||||||
|
linter_${name}.args = ${toLuaObject value}
|
||||||
|
'')
|
||||||
|
cfg.configuredLinters;
|
||||||
|
in
|
||||||
|
entryAnywhere ''
|
||||||
|
local lint = require("lint")
|
||||||
|
${mappedLinters}
|
||||||
|
lint.linters_by_ft = ${toLuaObject cfg.setupOpts.linters_by_ft};
|
||||||
|
|
||||||
|
-- TODO: one way of doing this dynamically is to use take required
|
||||||
|
-- parameters like fts, commands, arguments and everything expected
|
||||||
|
-- by nvim-lint to simply construct multiple autocommands. nvim-lint
|
||||||
|
-- doesn't seem to be able to handle that by itself.
|
||||||
|
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
|
||||||
|
callback = function()
|
||||||
|
-- try_lint without arguments runs the linters defined in `linters_by_ft`
|
||||||
|
-- for the current filetype
|
||||||
|
require("lint").try_lint()
|
||||||
|
end,
|
||||||
|
})
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,21 @@
|
||||||
{lib, ...}: let
|
{lib, ...}: let
|
||||||
inherit (lib.options) mkOption mkEnableOption;
|
inherit (lib.options) mkOption mkEnableOption;
|
||||||
inherit (lib.types) attrsOf listOf str;
|
inherit (lib.types) attrsOf listOf str anything;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
inherit (lib.nvim.types) mkPluginSetupOption;
|
||||||
in {
|
in {
|
||||||
options.vim.diagnostics.nvim-lint = {
|
options.vim.diagnostics.nvim-lint = {
|
||||||
enable = mkEnableOption "asynchronous linter plugin for Neovim [nvim-lint]";
|
enable = mkEnableOption "asynchronous linter plugin for Neovim [nvim-lint]";
|
||||||
|
|
||||||
|
configuredLinters = mkOption {
|
||||||
|
type = attrsOf anything;
|
||||||
|
default = {};
|
||||||
|
description = "";
|
||||||
|
};
|
||||||
|
|
||||||
setupOpts = mkPluginSetupOption "nvim-lint" {
|
setupOpts = mkPluginSetupOption "nvim-lint" {
|
||||||
linters_by_ft = mkOption {
|
linters_by_ft = mkOption {
|
||||||
type = attrsOf (listOf str);
|
type = attrsOf (listOf str);
|
||||||
default = {};
|
default = {markdown = ["value"];};
|
||||||
example = {
|
example = {
|
||||||
text = ["vale"];
|
text = ["vale"];
|
||||||
markdown = ["vale"];
|
markdown = ["vale"];
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.options) mkOption mkEnableOption literalExpression;
|
inherit (lib.options) mkOption mkEnableOption literalExpression;
|
||||||
inherit (lib.types) attrsOf anything list either;
|
inherit (lib.types) attrsOf anything listOf either;
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption luaInline;
|
inherit (lib.nvim.types) mkPluginSetupOption luaInline;
|
||||||
|
|
||||||
cfg = config.vim.formatter.conform-nvim;
|
cfg = config.vim.formatter.conform-nvim;
|
||||||
|
|
@ -42,7 +42,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
formatters_by_ft = mkOption {
|
formatters_by_ft = mkOption {
|
||||||
type = either (attrsOf list) luaInline;
|
type = either (attrsOf (listOf anything)) luaInline;
|
||||||
default = {};
|
default = {};
|
||||||
example = {lua = ["stylua"];};
|
example = {lua = ["stylua"];};
|
||||||
description = ''
|
description = ''
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue