mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2026-05-07 18:18:01 +02:00
languages/docker: init
This commit is contained in:
parent
af2ec2df1f
commit
0c2c99541b
5 changed files with 173 additions and 1 deletions
|
|
@ -79,6 +79,7 @@ isMaximal: {
|
|||
toml.enable = isMaximal;
|
||||
xml.enable = isMaximal;
|
||||
tex.enable = isMaximal;
|
||||
docker.enable = isMaximal;
|
||||
|
||||
# Language modules that are not as common.
|
||||
openscad.enable = false;
|
||||
|
|
|
|||
|
|
@ -335,6 +335,10 @@
|
|||
- Added [Selenen](https://github.com/kampfkarren/selene) for more diagnostics in
|
||||
`languages.lua`.
|
||||
|
||||
- Added `languages.docker` for Docker and Docker-Compose support. Thanks to
|
||||
[poseidon-rises](https://github.com/poseidon-rises) for creating most of it in
|
||||
[!1104](https://github.com/NotAShelf/nvf/pull/1104).
|
||||
|
||||
- Added [`mdformat`](https://mdformat.rtfd.io/) support to `languages.markdown`
|
||||
with the extensions for [GFM](https://github.github.com/gfm/),
|
||||
[front matter](https://www.markdownlang.com/advanced/frontmatter.html) and
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ in {
|
|||
./fluent.nix
|
||||
./openscad.nix
|
||||
./jq.nix
|
||||
./docker.nix
|
||||
|
||||
# This is now a hard deprecation.
|
||||
(mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])
|
||||
|
|
|
|||
166
modules/plugins/languages/docker.nix
Normal file
166
modules/plugins/languages/docker.nix
Normal file
|
|
@ -0,0 +1,166 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) attrNames;
|
||||
inherit (lib) genAttrs;
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.options) mkEnableOption mkOption literalExpression;
|
||||
inherit (lib.modules) mkIf mkMerge;
|
||||
inherit (lib.types) enum listOf;
|
||||
inherit (lib.nvim.types) mkGrammarOption diagnostics;
|
||||
inherit (lib.nvim.attrsets) mapListToAttrs;
|
||||
inherit (lib.generators) mkLuaInline;
|
||||
|
||||
cfg = config.vim.languages.docker;
|
||||
|
||||
defaultServers = ["docker-language-server"];
|
||||
servers = ["docker-language-server"];
|
||||
|
||||
defaultFormat = ["dockerfmt"];
|
||||
formats = {
|
||||
dockerfmt = {
|
||||
command = getExe pkgs.dockerfmt;
|
||||
};
|
||||
};
|
||||
|
||||
defaultDiagnosticsProvider = ["hadolint"];
|
||||
diagnosticsProviders = {
|
||||
hadolint = {
|
||||
config.cmd = getExe (
|
||||
pkgs.writeShellApplication {
|
||||
name = "hadolint";
|
||||
runtimeInputs = [pkgs.hadolint];
|
||||
text = "hadolint -";
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
in {
|
||||
options.vim.languages.docker = {
|
||||
enable = mkEnableOption "Docker language support";
|
||||
treesitter = {
|
||||
enable =
|
||||
mkEnableOption "Docker treesitter support"
|
||||
// {
|
||||
default = config.vim.languages.enableTreesitter;
|
||||
defaultText = literalExpression "config.vim.languages.enableTreesitter";
|
||||
};
|
||||
package = mkGrammarOption pkgs "dockerfile";
|
||||
};
|
||||
|
||||
lsp = {
|
||||
enable =
|
||||
mkEnableOption "Docker LSP support"
|
||||
// {
|
||||
default = config.vim.lsp.enable;
|
||||
defaultText = literalExpression "config.vim.lsp.enable";
|
||||
};
|
||||
servers = mkOption {
|
||||
type = listOf (enum servers);
|
||||
default = defaultServers;
|
||||
description = "Docker LSP server to use";
|
||||
};
|
||||
};
|
||||
|
||||
format = {
|
||||
enable =
|
||||
mkEnableOption "Dockerfile formatting"
|
||||
// {
|
||||
default = config.vim.languages.enableFormat;
|
||||
defaultText = literalExpression "config.vim.languages.enableFormat";
|
||||
};
|
||||
|
||||
type = mkOption {
|
||||
type = listOf (enum (attrNames formats));
|
||||
default = defaultFormat;
|
||||
description = "Dockerfile formatter to use";
|
||||
};
|
||||
};
|
||||
|
||||
extraDiagnostics = {
|
||||
enable =
|
||||
mkEnableOption "extra Dockerfile diagnostics"
|
||||
// {
|
||||
default = config.vim.languages.enableExtraDiagnostics;
|
||||
};
|
||||
|
||||
types = diagnostics {
|
||||
langDesc = "Dockerfile";
|
||||
inherit diagnosticsProviders;
|
||||
inherit defaultDiagnosticsProvider;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
vim.autocmds = [
|
||||
# Without this the LSP doesn't understand them correctly
|
||||
# and there are conflicts with the YAML LSP
|
||||
{
|
||||
desc = "Set Docker Compose filetype";
|
||||
event = ["BufRead" "BufNewFile"];
|
||||
pattern = [
|
||||
"compose.yml"
|
||||
"compose.yaml"
|
||||
"docker-compose.yml"
|
||||
"docker-compose.yaml"
|
||||
];
|
||||
callback = mkLuaInline ''
|
||||
vim.bo.filetype = "dockercompose"
|
||||
'';
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
(mkIf cfg.treesitter.enable {
|
||||
vim.treesitter = {
|
||||
enable = true;
|
||||
grammars = [cfg.treesitter.package];
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.lsp.enable {
|
||||
vim.lsp = {
|
||||
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
|
||||
servers = genAttrs cfg.lsp.servers (_: {
|
||||
filetypes = [
|
||||
"dockerfile"
|
||||
"dockercompose"
|
||||
];
|
||||
});
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.format.enable {
|
||||
vim.formatter.conform-nvim = {
|
||||
enable = true;
|
||||
setupOpts = {
|
||||
formatters_by_ft.dockerfile = cfg.format.type;
|
||||
formatters =
|
||||
mapListToAttrs (name: {
|
||||
inherit name;
|
||||
value = formats.${name};
|
||||
})
|
||||
cfg.format.type;
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.extraDiagnostics.enable {
|
||||
vim.diagnostics.nvim-lint = {
|
||||
enable = true;
|
||||
linters_by_ft.dockerfile = cfg.extraDiagnostics.types;
|
||||
linters = mkMerge (
|
||||
map (name: {
|
||||
${name} = diagnosticsProviders.${name}.config;
|
||||
})
|
||||
cfg.extraDiagnostics.types
|
||||
);
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
cfg = config.vim.languages.hcl;
|
||||
|
||||
defaultServers = ["tofu-ls"];
|
||||
servers = ["terraform-ls" "tofu-ls"];
|
||||
servers = ["terraform-ls" "tofu-ls" "docker-language-server"];
|
||||
|
||||
defaultFormat = ["hclfmt"];
|
||||
formats = {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue