diff options
Diffstat (limited to 'dotfiles')
-rw-r--r-- | dotfiles/vim/lua/myConfig.lua | 31 | ||||
-rw-r--r-- | dotfiles/vim/lua/vim-dev.lua | 28 |
2 files changed, 28 insertions, 31 deletions
diff --git a/dotfiles/vim/lua/myConfig.lua b/dotfiles/vim/lua/myConfig.lua index fd4fe0b..92073b4 100644 --- a/dotfiles/vim/lua/myConfig.lua +++ b/dotfiles/vim/lua/myConfig.lua | |||
@@ -510,37 +510,6 @@ vim.api.nvim_create_user_command("Browse", function(opts) | |||
510 | }):start() | 510 | }):start() |
511 | end, { nargs = 1 }) | 511 | end, { nargs = 1 }) |
512 | 512 | ||
513 | -- Null LSP | ||
514 | |||
515 | local on_attach = require('myConfig.exports').on_attach | ||
516 | |||
517 | local null_ls = require("null-ls") | ||
518 | |||
519 | null_ls.setup({ | ||
520 | sources = { | ||
521 | null_ls.builtins.code_actions.gitrebase, | ||
522 | null_ls.builtins.code_actions.gitsigns, | ||
523 | null_ls.builtins.code_actions.refactoring.with { | ||
524 | filetypes = { "typescript", "javascript", "lua", "c", "cpp", "go", "python", "java", "php", "ruby" }, | ||
525 | }, | ||
526 | null_ls.builtins.code_actions.shellcheck, | ||
527 | null_ls.builtins.code_actions.statix, | ||
528 | |||
529 | null_ls.builtins.diagnostics.deadnix, | ||
530 | null_ls.builtins.diagnostics.shellcheck, | ||
531 | null_ls.builtins.diagnostics.statix, | ||
532 | null_ls.builtins.diagnostics.typos, | ||
533 | null_ls.builtins.diagnostics.vale.with { | ||
534 | filetypes = { "markdown", "pandoc", "rst", "tex", "asciidoc" }, | ||
535 | }, | ||
536 | |||
537 | null_ls.builtins.formatting.alejandra, | ||
538 | null_ls.builtins.formatting.shfmt, | ||
539 | null_ls.builtins.formatting.taplo, | ||
540 | }, | ||
541 | on_attach = on_attach, | ||
542 | }) | ||
543 | |||
544 | -- Local config | 513 | -- Local config |
545 | 514 | ||
546 | local function isModuleAvailable(name) | 515 | local function isModuleAvailable(name) |
diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua index bae20d2..98db662 100644 --- a/dotfiles/vim/lua/vim-dev.lua +++ b/dotfiles/vim/lua/vim-dev.lua | |||
@@ -29,6 +29,34 @@ require("neodev").setup({}) | |||
29 | -- Refactoring | 29 | -- Refactoring |
30 | require("refactoring").setup {} | 30 | require("refactoring").setup {} |
31 | 31 | ||
32 | -- Null LSP | ||
33 | |||
34 | local null_ls = require("null-ls") | ||
35 | |||
36 | null_ls.setup({ | ||
37 | sources = { | ||
38 | null_ls.builtins.code_actions.gitrebase, | ||
39 | null_ls.builtins.code_actions.gitsigns, | ||
40 | null_ls.builtins.code_actions.refactoring.with { | ||
41 | filetypes = { "typescript", "javascript", "lua", "c", "cpp", "go", "python", "java", "php", "ruby" }, | ||
42 | }, | ||
43 | null_ls.builtins.code_actions.shellcheck, | ||
44 | null_ls.builtins.code_actions.statix, | ||
45 | |||
46 | null_ls.builtins.diagnostics.deadnix, | ||
47 | null_ls.builtins.diagnostics.shellcheck, | ||
48 | null_ls.builtins.diagnostics.statix, | ||
49 | null_ls.builtins.diagnostics.vale.with { | ||
50 | filetypes = { "markdown", "pandoc", "rst", "tex", "asciidoc" }, | ||
51 | }, | ||
52 | |||
53 | null_ls.builtins.formatting.alejandra, | ||
54 | null_ls.builtins.formatting.shfmt, | ||
55 | null_ls.builtins.formatting.taplo, | ||
56 | }, | ||
57 | on_attach = on_attach, | ||
58 | }) | ||
59 | |||
32 | -- Vim Pandoc | 60 | -- Vim Pandoc |
33 | vim.g["pandoc#formatting#equalprg"] = "pandoc -t markdown --wrap=preserve" | 61 | vim.g["pandoc#formatting#equalprg"] = "pandoc -t markdown --wrap=preserve" |
34 | vim.g["pandoc#formatting#extra_equalprg"] = "--reference-links --reference-location=section" | 62 | vim.g["pandoc#formatting#extra_equalprg"] = "--reference-links --reference-location=section" |