This repository has no description
New Formatter (#4)
* Fix workflow names and add badges
* Move to new formatter
+335
-230
+8
-8
config/extra.nix
+8
-8
config/extra.nix
···
1
-
{ pkgs
2
-
, ...
1
+
{
2
+
pkgs,
3
+
...
3
4
}:
4
5
{
5
-
extraPlugins = with pkgs.vimPlugins;
6
-
[
7
-
jinja-vim
8
-
trailblazer-nvim
9
-
];
6
+
extraPlugins = with pkgs.vimPlugins; [
7
+
jinja-vim
8
+
trailblazer-nvim
9
+
];
10
10
extraConfigLua = ''
11
11
vim.api.nvim_create_autocmd("FileType", {
12
12
callback = function()
13
13
local buf = vim.api.nvim_get_current_buf()
14
-
14
+
15
15
-- Check if the autocmd has already been loaded for this buffer
16
16
if not vim.b[buf].jinja_syntax_autocmd_loaded then
17
17
-- Check if the jinja treesitter parser is available
+17
-4
config/file_types.nix
+17
-4
config/file_types.nix
···
6
6
files."ftdetect/terraformft.lua".autoCmd = [
7
7
{
8
8
group = "filetypes";
9
-
event = [ "BufRead" "BufNewFile" ];
10
-
pattern = [ "*.tf" " *.tfvars" " *.hcl" ];
9
+
event = [
10
+
"BufRead"
11
+
"BufNewFile"
12
+
];
13
+
pattern = [
14
+
"*.tf"
15
+
" *.tfvars"
16
+
" *.hcl"
17
+
];
11
18
command = "set ft=terraform";
12
19
}
13
20
];
···
15
22
files."ftdetect/bicepft.lua".autoCmd = [
16
23
{
17
24
group = "filetypes";
18
-
event = [ "BufRead" "BufNewFile" ];
19
-
pattern = [ "*.bicep" "*.bicepparam" ];
25
+
event = [
26
+
"BufRead"
27
+
"BufNewFile"
28
+
];
29
+
pattern = [
30
+
"*.bicep"
31
+
"*.bicepparam"
32
+
];
20
33
command = "set ft=bicep";
21
34
}
22
35
];
+51
-18
config/keymaps.nix
+51
-18
config/keymaps.nix
···
39
39
};
40
40
}
41
41
{
42
-
mode = [ "i" "x" "n" "s" ];
42
+
mode = [
43
+
"i"
44
+
"x"
45
+
"n"
46
+
"s"
47
+
];
43
48
key = "<C-s>";
44
49
action = "<cmd>w<cr><esc>";
45
-
options = { desc = "Save File"; };
50
+
options = {
51
+
desc = "Save File";
52
+
};
46
53
}
47
54
{
48
55
mode = "n";
49
56
key = "<leader>`";
50
57
action = "vim.diagnostic.open_float";
51
-
options = { desc = "Line Diagnostics"; };
58
+
options = {
59
+
desc = "Line Diagnostics";
60
+
};
52
61
}
53
62
{
54
63
mode = "n";
55
64
key = "]d";
56
65
action = "diagnostic_goto(true)";
57
-
options = { desc = "Next Diagnostic"; };
66
+
options = {
67
+
desc = "Next Diagnostic";
68
+
};
58
69
}
59
70
{
60
71
mode = "n";
61
72
key = "[d";
62
73
action = "diagnostic_goto(false)";
63
-
options = { desc = "Prev Diagnostic"; };
74
+
options = {
75
+
desc = "Prev Diagnostic";
76
+
};
64
77
}
65
78
{
66
79
mode = "n";
67
80
key = "]e";
68
81
action = "diagnostic_goto(true 'ERROR')";
69
-
options = { desc = "Next Error"; };
82
+
options = {
83
+
desc = "Next Error";
84
+
};
70
85
}
71
86
{
72
87
mode = "n";
73
88
key = "[e";
74
89
action = "diagnostic_goto(false 'ERROR')";
75
-
options = { desc = "Prev Error"; };
90
+
options = {
91
+
desc = "Prev Error";
92
+
};
76
93
}
77
94
{
78
95
mode = "n";
79
96
key = "]w";
80
97
action = "diagnostic_goto(true 'WARN')";
81
-
options = { desc = "Next Warning"; };
98
+
options = {
99
+
desc = "Next Warning";
100
+
};
82
101
}
83
102
{
84
103
mode = "n";
85
104
key = "[w";
86
105
action = "diagnostic_goto(false 'WARN')";
87
-
options = { desc = "Prev Warning"; };
106
+
options = {
107
+
desc = "Prev Warning";
108
+
};
88
109
}
89
110
{
90
111
mode = "t";
91
112
key = "<C-h>";
92
113
action = "<cmd>wincmd h<cr>";
93
-
options = { desc = "Go to Left Window"; };
114
+
options = {
115
+
desc = "Go to Left Window";
116
+
};
94
117
}
95
118
{
96
119
mode = "t";
97
120
key = "<C-j>";
98
121
action = "<cmd>wincmd j<cr>";
99
-
options = { desc = "Go to Lower Window"; };
122
+
options = {
123
+
desc = "Go to Lower Window";
124
+
};
100
125
}
101
126
{
102
127
mode = "t";
103
128
key = "<C-k>";
104
129
action = "<cmd>wincmd k<cr>";
105
-
options = { desc = "Go to Upper Window"; };
130
+
options = {
131
+
desc = "Go to Upper Window";
132
+
};
106
133
}
107
134
{
108
135
mode = "t";
109
136
key = "<C-l>";
110
137
action = "<cmd>wincmd l<cr>";
111
-
options = { desc = "Go to Right Window"; };
138
+
options = {
139
+
desc = "Go to Right Window";
140
+
};
112
141
}
113
142
{
114
143
mode = "t";
115
144
key = "<C-/>";
116
145
action = "<cmd>close<cr>";
117
-
options = { desc = "Hide Terminal"; };
146
+
options = {
147
+
desc = "Hide Terminal";
148
+
};
118
149
}
119
150
{
120
151
mode = "n";
···
174
205
mode = "n";
175
206
key = "ä";
176
207
action = "za";
177
-
options = { desc = "Fold/Unfold at current line"; };
208
+
options = {
209
+
desc = "Fold/Unfold at current line";
210
+
};
178
211
}
179
212
{
180
213
mode = "n";
181
214
key = "Ä";
182
215
action = "zR";
183
-
options = { desc = "Fold/Unfold file"; };
216
+
options = {
217
+
desc = "Fold/Unfold file";
218
+
};
184
219
}
185
220
186
221
# General movements
···
460
495
}
461
496
];
462
497
}
463
-
464
-
+4
-1
config/plugins/cmp/autopairs.nix
+4
-1
config/plugins/cmp/autopairs.nix
+6
-2
config/plugins/cmp/cmp.nix
+6
-2
config/plugins/cmp/cmp.nix
+1
-2
config/plugins/editor/fold.nix
+1
-2
config/plugins/editor/fold.nix
+9
-2
config/plugins/editor/neo-tree.nix
+9
-2
config/plugins/editor/neo-tree.nix
···
1
1
{
2
2
plugins.neo-tree = {
3
3
enable = true;
4
-
sources = [ "filesystem" "buffers" "git_status" "document_symbols" ];
4
+
sources = [
5
+
"filesystem"
6
+
"buffers"
7
+
"git_status"
8
+
"document_symbols"
9
+
];
5
10
addBlankLineAtTop = false;
6
11
7
12
filesystem = {
···
40
45
mode = [ "n" ];
41
46
key = "<leader>e";
42
47
action = "<cmd>Neotree toggle<cr>";
43
-
options = { desc = "Open/Close Neotree"; };
48
+
options = {
49
+
desc = "Open/Close Neotree";
50
+
};
44
51
}
45
52
];
46
53
}
+22
-5
config/plugins/editor/todo-comments.nix
+22
-5
config/plugins/editor/todo-comments.nix
···
3
3
enable = true;
4
4
settings = {
5
5
colors = {
6
-
error = [ "DiagnosticError" "ErrorMsg" "#ED8796" ];
7
-
warning = [ "DiagnosticWarn" "WarningMsg" "#EED49F" ];
8
-
info = [ "DiagnosticInfo" "#EED49F" ];
9
-
default = [ "Identifier" "#F5A97F" ];
10
-
test = [ "Identifier" "#8AADF4" ];
6
+
error = [
7
+
"DiagnosticError"
8
+
"ErrorMsg"
9
+
"#ED8796"
10
+
];
11
+
warning = [
12
+
"DiagnosticWarn"
13
+
"WarningMsg"
14
+
"#EED49F"
15
+
];
16
+
info = [
17
+
"DiagnosticInfo"
18
+
"#EED49F"
19
+
];
20
+
default = [
21
+
"Identifier"
22
+
"#F5A97F"
23
+
];
24
+
test = [
25
+
"Identifier"
26
+
"#8AADF4"
27
+
];
11
28
};
12
29
};
13
30
};
+1
-2
config/plugins/editor/trailblazer.nix
+1
-2
config/plugins/editor/trailblazer.nix
+2
-1
config/plugins/editor/treesitter.nix
+2
-1
config/plugins/editor/treesitter.nix
+7
-5
config/plugins/lsp/conform.nix
+7
-5
config/plugins/lsp/conform.nix
···
1
-
{ lib
2
-
, pkgs
3
-
, ...
4
-
}: {
1
+
{
2
+
lib,
3
+
pkgs,
4
+
...
5
+
}:
6
+
{
5
7
config = {
6
8
plugins.conform-nvim = {
7
9
enable = true;
···
82
84
command = "${lib.getExe pkgs.alejandra}";
83
85
};
84
86
nixfmt = {
85
-
command = "${lib.getExe pkgs.nixpkgs-fmt}";
87
+
command = "${lib.getExe pkgs.nixfmt-rfc-style}";
86
88
};
87
89
jq = {
88
90
command = "${lib.getExe pkgs.jq}";
+126
-129
config/plugins/lsp/dap.nix
+126
-129
config/plugins/lsp/dap.nix
···
1
-
{ config
2
-
, lib
3
-
, pkgs
4
-
, ...
1
+
{
2
+
config,
3
+
lib,
4
+
pkgs,
5
+
...
5
6
}:
6
7
let
7
8
sh-config = lib.mkIf pkgs.stdenv.isLinux {
···
25
26
};
26
27
in
27
28
{
28
-
extraPackages = with pkgs;
29
+
extraPackages =
30
+
with pkgs;
29
31
[
30
32
coreutils
31
33
lldb_19
···
161
163
enable = false;
162
164
};
163
165
164
-
which-key.settings.spec = lib.optionals
165
-
config.plugins.dap-ui.enable
166
-
[
167
-
{
168
-
__unkeyed = "<leader>d";
169
-
mode = "n";
170
-
desc = "Debug";
171
-
# icon = " ";
172
-
}
173
-
];
174
-
};
175
-
176
-
keymaps = lib.optionals
177
-
config.plugins.dap-ui.enable
178
-
[
179
-
{
180
-
mode = "v";
181
-
key = "<leader>e";
182
-
action.__raw = ''
183
-
function() require("dapui").eval() end
184
-
'';
185
-
options = {
186
-
desc = "Evaluate Input";
187
-
silent = true;
188
-
};
189
-
}
190
-
{
191
-
mode = "n";
192
-
key = "<leader>dh";
193
-
action.__raw = ''
194
-
function() require("dap.ui.widgets").hover() end
195
-
'';
196
-
options = {
197
-
desc = "Debugger Hover";
198
-
silent = true;
199
-
};
200
-
}
201
-
{
202
-
mode = "n";
203
-
key = "<leader>d";
204
-
action.__raw = ''
205
-
function()
206
-
require("dapui").toggle( { reset = true; } )
207
-
end
208
-
'';
209
-
options = {
210
-
desc = "Toggle Debugger UI";
211
-
silent = true;
212
-
};
213
-
}
214
-
{
215
-
mode = "n";
216
-
key = "<F5>";
217
-
action.__raw = ''
218
-
function()
219
-
require("dap").continue()
220
-
end
221
-
'';
222
-
options = {
223
-
desc = "Continue Debugging (Start)";
224
-
silent = true;
225
-
};
226
-
}
227
-
{
228
-
mode = "n";
229
-
key = "<F9>";
230
-
action.__raw = ''
231
-
function()
232
-
require("dap").toggle_breakpoint()
233
-
end
234
-
'';
235
-
options = {
236
-
desc = "Breakpoint toggle";
237
-
silent = true;
238
-
};
239
-
}
240
-
{
241
-
mode = "n";
242
-
key = "<F10>";
243
-
action.__raw = ''
244
-
function()
245
-
require("dap").step_over()
246
-
end
247
-
'';
248
-
options = {
249
-
desc = "Step Over";
250
-
silent = true;
251
-
};
252
-
}
253
-
{
254
-
mode = "n";
255
-
key = "<F11>";
256
-
action.__raw = ''
257
-
function()
258
-
require("dap").step_into()
259
-
end
260
-
'';
261
-
options = {
262
-
desc = "Step Into";
263
-
silent = true;
264
-
};
265
-
}
166
+
which-key.settings.spec = lib.optionals config.plugins.dap-ui.enable [
266
167
{
168
+
__unkeyed = "<leader>d";
267
169
mode = "n";
268
-
key = "<F12>";
269
-
action.__raw = ''
270
-
function()
271
-
require("dap").step_out()
272
-
end
273
-
'';
274
-
options = {
275
-
desc = "Step Out";
276
-
silent = true;
277
-
};
278
-
}
279
-
{
280
-
mode = "n";
281
-
key = "<leader>q";
282
-
action.__raw = ''
283
-
function() require("dap").terminate() end
284
-
'';
285
-
options = {
286
-
desc = "Terminate Debugging";
287
-
silent = true;
288
-
};
170
+
desc = "Debug";
171
+
# icon = " ";
289
172
}
290
173
];
174
+
};
175
+
176
+
keymaps = lib.optionals config.plugins.dap-ui.enable [
177
+
{
178
+
mode = "v";
179
+
key = "<leader>e";
180
+
action.__raw = ''
181
+
function() require("dapui").eval() end
182
+
'';
183
+
options = {
184
+
desc = "Evaluate Input";
185
+
silent = true;
186
+
};
187
+
}
188
+
{
189
+
mode = "n";
190
+
key = "<leader>dh";
191
+
action.__raw = ''
192
+
function() require("dap.ui.widgets").hover() end
193
+
'';
194
+
options = {
195
+
desc = "Debugger Hover";
196
+
silent = true;
197
+
};
198
+
}
199
+
{
200
+
mode = "n";
201
+
key = "<leader>d";
202
+
action.__raw = ''
203
+
function()
204
+
require("dapui").toggle( { reset = true; } )
205
+
end
206
+
'';
207
+
options = {
208
+
desc = "Toggle Debugger UI";
209
+
silent = true;
210
+
};
211
+
}
212
+
{
213
+
mode = "n";
214
+
key = "<F5>";
215
+
action.__raw = ''
216
+
function()
217
+
require("dap").continue()
218
+
end
219
+
'';
220
+
options = {
221
+
desc = "Continue Debugging (Start)";
222
+
silent = true;
223
+
};
224
+
}
225
+
{
226
+
mode = "n";
227
+
key = "<F9>";
228
+
action.__raw = ''
229
+
function()
230
+
require("dap").toggle_breakpoint()
231
+
end
232
+
'';
233
+
options = {
234
+
desc = "Breakpoint toggle";
235
+
silent = true;
236
+
};
237
+
}
238
+
{
239
+
mode = "n";
240
+
key = "<F10>";
241
+
action.__raw = ''
242
+
function()
243
+
require("dap").step_over()
244
+
end
245
+
'';
246
+
options = {
247
+
desc = "Step Over";
248
+
silent = true;
249
+
};
250
+
}
251
+
{
252
+
mode = "n";
253
+
key = "<F11>";
254
+
action.__raw = ''
255
+
function()
256
+
require("dap").step_into()
257
+
end
258
+
'';
259
+
options = {
260
+
desc = "Step Into";
261
+
silent = true;
262
+
};
263
+
}
264
+
{
265
+
mode = "n";
266
+
key = "<F12>";
267
+
action.__raw = ''
268
+
function()
269
+
require("dap").step_out()
270
+
end
271
+
'';
272
+
options = {
273
+
desc = "Step Out";
274
+
silent = true;
275
+
};
276
+
}
277
+
{
278
+
mode = "n";
279
+
key = "<leader>q";
280
+
action.__raw = ''
281
+
function() require("dap").terminate() end
282
+
'';
283
+
options = {
284
+
desc = "Terminate Debugging";
285
+
silent = true;
286
+
};
287
+
}
288
+
];
291
289
}
292
-
+35
-18
config/plugins/lsp/lsp.nix
+35
-18
config/plugins/lsp/lsp.nix
···
1
-
{ pkgs
2
-
, ...
3
-
}: {
1
+
{
2
+
pkgs,
3
+
...
4
+
}:
5
+
{
4
6
plugins = {
5
7
lsp-format = {
6
8
enable = true;
7
9
};
8
-
helm = { enable = true; };
10
+
helm = {
11
+
enable = true;
12
+
};
9
13
lsp = {
10
14
enable = true;
11
15
inlayHints = false;
12
16
servers = {
13
-
html = { enable = true; };
14
-
lua_ls = { enable = true; };
17
+
html = {
18
+
enable = true;
19
+
};
20
+
lua_ls = {
21
+
enable = true;
22
+
};
15
23
nil_ls = {
16
24
enable = true;
17
25
settings.nix.flake.autoArchive = true;
18
26
};
19
-
marksman = { enable = true; };
20
-
pyright = { enable = true; };
27
+
marksman = {
28
+
enable = true;
29
+
};
30
+
pyright = {
31
+
enable = true;
32
+
};
21
33
clangd = {
22
34
enable = true;
23
35
package = pkgs.llvmPackages_18.clang-tools;
···
30
42
"--clang-tidy"
31
43
];
32
44
};
33
-
cmake = { enable = true; };
34
-
jsonls = { enable = true; };
35
-
rust_analyzer =
36
-
{
37
-
enable = true;
38
-
installCargo = true;
39
-
installRustc = true;
40
-
};
45
+
cmake = {
46
+
enable = true;
47
+
};
48
+
jsonls = {
49
+
enable = true;
50
+
};
51
+
rust_analyzer = {
52
+
enable = true;
53
+
installCargo = true;
54
+
installRustc = true;
55
+
};
41
56
yamlls = {
42
57
enable = true;
43
58
extraOptions = {
···
50
65
"http://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}";
51
66
"http://json.schemastore.org/chart" = "Chart.{yml,yaml}";
52
67
"https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}";
53
-
"https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}";
54
-
"https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}";
68
+
"https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" =
69
+
"*docker-compose*.{yml,yaml}";
70
+
"https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" =
71
+
"*flow*.{yml,yaml}";
55
72
};
56
73
};
57
74
};
+4
-1
config/plugins/ui/lualine.nix
+4
-1
config/plugins/ui/lualine.nix
+4
-1
config/plugins/ui/startup.nix
+4
-1
config/plugins/ui/startup.nix
+2
-1
config/plugins/utils/extra_plugins.nix
+2
-1
config/plugins/utils/extra_plugins.nix
+13
-12
config/settings.nix
+13
-12
config/settings.nix
···
12
12
'';
13
13
14
14
clipboard = {
15
-
register = [ "unnamed" "unnamedplus" ];
15
+
register = [
16
+
"unnamed"
17
+
"unnamedplus"
18
+
];
16
19
providers.wl-copy.enable = true;
17
20
providers.xclip.enable = true;
18
21
};
···
54
57
55
58
# Fold config
56
59
foldcolumn = "0";
57
-
fillchars =
58
-
{
59
-
eob = " ";
60
-
fold = " ";
61
-
foldopen = "▾";
62
-
foldsep = " ";
63
-
foldclose = "▸";
64
-
vert = "║";
65
-
horiz = "═";
66
-
};
60
+
fillchars = {
61
+
eob = " ";
62
+
fold = " ";
63
+
foldopen = "▾";
64
+
foldsep = " ";
65
+
foldclose = "▸";
66
+
vert = "║";
67
+
horiz = "═";
68
+
};
67
69
foldlevel = 99;
68
70
foldlevelstart = 99;
69
71
foldenable = true;
···
100
102
};
101
103
};
102
104
}
103
-
+21
-15
flake.nix
+21
-15
flake.nix
···
21
21
};
22
22
23
23
outputs =
24
-
{ nixvim
25
-
, flake-parts
26
-
, treefmt-nix
27
-
, pre-commit-hooks
28
-
, ...
29
-
} @ inputs:
24
+
{
25
+
nixvim,
26
+
flake-parts,
27
+
treefmt-nix,
28
+
pre-commit-hooks,
29
+
...
30
+
}@inputs:
30
31
flake-parts.lib.mkFlake { inherit inputs; } {
31
-
systems = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
32
+
systems = [
33
+
"aarch64-linux"
34
+
"x86_64-linux"
35
+
"aarch64-darwin"
36
+
"x86_64-darwin"
37
+
];
32
38
33
39
perSystem =
34
-
{ system
35
-
, pkgs
36
-
, self'
37
-
, lib
38
-
, ...
40
+
{
41
+
system,
42
+
pkgs,
43
+
self',
44
+
lib,
45
+
...
39
46
}:
40
47
let
41
48
nixvim' = nixvim.legacyPackages.${system};
···
51
58
src = ./.;
52
59
hooks = {
53
60
statix.enable = true;
54
-
nixpkgs-fmt.enable = true;
61
+
nixfmt-rfc-style.enable = true;
55
62
deadnix.enable = true;
56
63
};
57
64
};
···
62
69
packages.default = nvim;
63
70
64
71
devShells = {
65
-
default = with pkgs;
66
-
mkShell { inherit (self'.checks.pre-commit-check) shellHook; };
72
+
default = with pkgs; mkShell { inherit (self'.checks.pre-commit-check) shellHook; };
67
73
};
68
74
};
69
75
};