Skip to content

Commit 97ed044

Browse files
committed
language/docker: init
1 parent 5836038 commit 97ed044

4 files changed

Lines changed: 162 additions & 0 deletions

File tree

configuration.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ isMaximal: {
7878
toml.enable = isMaximal;
7979
xml.enable = isMaximal;
8080
tex.enable = isMaximal;
81+
docker.enable = isMaximal;
8182

8283
# Language modules that are not as common.
8384
openscad.enable = false;

docs/manual/release-notes/rl-0.9.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@
216216
- Added [Selenen](https://github.com/kampfkarren/selene) for more diagnostics in
217217
`languages.lua`.
218218
219+
- Added `languages.docker` for Docker and Docker-Compose support. Thanks to
220+
[poseidon-rises](https://github.com/poseidon-rises) for creating most of it in
221+
[!1104](https://github.com/NotAShelf/nvf/pull/1104).
222+
219223
- Added [`mdformat`](https://mdformat.rtfd.io/) support to `languages.markdown`
220224
with the extensions for [GFM](https://github.github.com/gfm/),
221225
[front matter](https://www.markdownlang.com/advanced/frontmatter.html) and

modules/plugins/languages/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ in {
6363
./gettext.nix
6464
./fluent.nix
6565
./openscad.nix
66+
./docker.nix
6667

6768
# This is now a hard deprecation.
6869
(mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])
Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
{
2+
config,
3+
pkgs,
4+
lib,
5+
...
6+
}: let
7+
inherit (builtins) attrNames;
8+
inherit (lib.meta) getExe;
9+
inherit (lib.options) mkEnableOption mkOption;
10+
inherit (lib.modules) mkIf mkMerge;
11+
inherit (lib.types) enum package listOf;
12+
inherit (lib.nvim.types) mkGrammarOption diagnostics;
13+
inherit (lib.nvim.attrsets) mapListToAttrs;
14+
15+
cfg = config.vim.languages.docker;
16+
17+
defaultServers = ["docker-language-server"];
18+
servers = {
19+
docker-language-server = {
20+
cmd = [
21+
(getExe pkgs.docker-language-server)
22+
"start"
23+
"--stdio"
24+
];
25+
filetypes = [
26+
"dockerfile"
27+
"dockercompose"
28+
];
29+
root_markers = [
30+
".git"
31+
"Dockerfile"
32+
"docker-compose.yaml"
33+
"docker-compose.yml"
34+
"compose.yaml"
35+
"compose.yml"
36+
"docker-bake.json"
37+
"docker-bake.hcl"
38+
];
39+
};
40+
};
41+
42+
defaultFormat = ["dockerfmt"];
43+
formats = {
44+
dockerfmt = {
45+
command = getExe pkgs.dockerfmt;
46+
};
47+
};
48+
49+
defaultDiagnosticsProvider = ["hadolint"];
50+
diagnosticsProviders = {
51+
hadolint = {
52+
config.cmd = getExe (
53+
pkgs.writeShellApplication {
54+
name = "hadolint";
55+
runtimeInputs = [pkgs.hadolint];
56+
text = "hadolint -";
57+
}
58+
);
59+
};
60+
};
61+
in {
62+
options.vim.languages.docker = {
63+
enable = mkEnableOption "Docker language support";
64+
treesitter = {
65+
enable = mkEnableOption "Docker treesitter support";
66+
package = mkGrammarOption pkgs "dockerfile";
67+
};
68+
69+
lsp = {
70+
enable =
71+
mkEnableOption "Docker LSP support"
72+
// {
73+
default = config.vim.lsp.enable;
74+
};
75+
servers = mkOption {
76+
type = listOf (enum (attrNames servers));
77+
default = defaultServers;
78+
description = "Docker LSP server to use";
79+
};
80+
};
81+
82+
format = {
83+
enable =
84+
mkEnableOption "Dockerfile formatting"
85+
// {
86+
default = config.vim.languages.enableFormat;
87+
};
88+
89+
type = mkOption {
90+
type = listOf (enum (attrNames formats));
91+
default = defaultFormat;
92+
description = "Dockerfile formatter to use";
93+
};
94+
};
95+
96+
extraDiagnostics = {
97+
enable =
98+
mkEnableOption "extra Dockerfile diagnostics"
99+
// {
100+
default = config.vim.languages.enableExtraDiagnostics;
101+
};
102+
103+
types = diagnostics {
104+
langDesc = "Dockerfile";
105+
inherit diagnosticsProviders;
106+
inherit defaultDiagnosticsProvider;
107+
};
108+
};
109+
};
110+
111+
config = mkMerge [
112+
(mkIf cfg.treesitter.enable {
113+
vim.treesitter = {
114+
enable = true;
115+
grammars = [cfg.treesitter.package];
116+
};
117+
})
118+
119+
(mkIf cfg.lsp.enable {
120+
vim.lsp.servers =
121+
mapListToAttrs (n: {
122+
name = n;
123+
value = servers.${n};
124+
})
125+
cfg.lsp.servers;
126+
})
127+
128+
(mkIf cfg.format.enable {
129+
vim.formatter.conform-nvim = {
130+
enable = true;
131+
setupOpts = {
132+
formatters_by_ft.dockerfile = cfg.format.type;
133+
formatters =
134+
mapListToAttrs (name: {
135+
inherit name;
136+
value = formats.${name};
137+
})
138+
cfg.format.type;
139+
};
140+
};
141+
})
142+
143+
(mkIf cfg.extraDiagnostics.enable {
144+
vim.diagnostics.nvim-lint = {
145+
enable = true;
146+
linters_by_ft.dockerfile = cfg.extraDiagnostics.types;
147+
linters = mkMerge (
148+
map (name: {
149+
${name} = diagnosticsProviders.${name}.config;
150+
})
151+
cfg.extraDiagnostics.types
152+
);
153+
};
154+
})
155+
];
156+
}

0 commit comments

Comments
 (0)