From a459ffd8135d27499a616f5405468a1b20677223 Mon Sep 17 00:00:00 2001 From: Christian Segundo Date: Sun, 8 Dec 2024 13:06:41 +0100 Subject: misc stylua --- lua/plugins/lang/ansible.lua | 44 +++++----- lua/plugins/lang/bash.lua | 76 ++++++++--------- lua/plugins/lang/c.lua | 64 +++++++------- lua/plugins/lang/dockerfile.lua | 42 +++++----- lua/plugins/lang/go.lua | 121 +++++++++++++------------- lua/plugins/lang/groovy.lua | 70 ++++++++-------- lua/plugins/lang/helm.lua | 8 +- lua/plugins/lang/jq.lua | 36 ++++---- lua/plugins/lang/json.lua | 49 +++++------ lua/plugins/lang/jsonnet.lua | 44 +++++----- lua/plugins/lang/ledger.lua | 46 +++++----- lua/plugins/lang/lua.lua | 83 +++++++++--------- lua/plugins/lang/markdown.lua | 182 +++++++++++++++++++++++----------------- lua/plugins/lang/nix.lua | 64 +++++++------- lua/plugins/lang/perl.lua | 66 ++++++++------- lua/plugins/lang/promql.lua | 32 +++---- lua/plugins/lang/python.lua | 36 ++++---- lua/plugins/lang/swift.lua | 62 +++++++------- lua/plugins/lang/terraform.lua | 72 ++++++++-------- lua/plugins/lang/typescript.lua | 34 -------- lua/plugins/lang/yaml.lua | 106 +++++++++++------------ lua/plugins/lang/zig.lua | 73 ++++++++-------- 22 files changed, 704 insertions(+), 706 deletions(-) delete mode 100644 lua/plugins/lang/typescript.lua (limited to 'lua/plugins/lang') diff --git a/lua/plugins/lang/ansible.lua b/lua/plugins/lang/ansible.lua index 6a65027..e86b201 100644 --- a/lua/plugins/lang/ansible.lua +++ b/lua/plugins/lang/ansible.lua @@ -1,26 +1,26 @@ return { - { - "arouene/vim-ansible-vault", - ft = { "ansible", "yaml.ansible", "yaml" }, - }, + { + "arouene/vim-ansible-vault", + ft = { "ansible", "yaml.ansible", "yaml" }, + }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "yaml" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "yaml" }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.ansiblels = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.ansiblels = {} + end + end, + }, } diff --git a/lua/plugins/lang/bash.lua b/lua/plugins/lang/bash.lua index 6c6c98c..1c4b738 100644 --- a/lua/plugins/lang/bash.lua +++ b/lua/plugins/lang/bash.lua @@ -1,42 +1,42 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "bash" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "bash" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.code_actions.shellcheck, -- Diagnostics handled by Bash LS - null_ls.builtins.formatting.shfmt, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.code_actions.shellcheck, -- Diagnostics handled by Bash LS + null_ls.builtins.formatting.shfmt, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - -- Just here because it doesn't work with the default node - -- https://github.com/bash-lsp/bash-language-server/issues/418 - --local brew_prefix = vim.fn.systemlist("brew --prefix")[1] - --local bashls_script_name = "bash-language-server" - --local bashls_script_path = vim.fn.systemlist("which " .. bashls_script_name)[1] - --local bashls_cmd = { brew_prefix .. "/opt/node@16/bin/node", bashls_script_path, "start" } - --opts.servers.bashls = { cmd = bashls_cmd } - opts.servers.bashls = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + -- Just here because it doesn't work with the default node + -- https://github.com/bash-lsp/bash-language-server/issues/418 + --local brew_prefix = vim.fn.systemlist("brew --prefix")[1] + --local bashls_script_name = "bash-language-server" + --local bashls_script_path = vim.fn.systemlist("which " .. bashls_script_name)[1] + --local bashls_cmd = { brew_prefix .. "/opt/node@16/bin/node", bashls_script_path, "start" } + --opts.servers.bashls = { cmd = bashls_cmd } + opts.servers.bashls = {} + end + end, + }, } diff --git a/lua/plugins/lang/c.lua b/lua/plugins/lang/c.lua index d91db70..a42e9d8 100644 --- a/lua/plugins/lang/c.lua +++ b/lua/plugins/lang/c.lua @@ -1,34 +1,34 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "c" }) - end - end, - }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.clang_check, - null_ls.builtins.diagnostics.cppcheck, - null_ls.builtins.diagnostics.cpplint, - }) - end - end, - }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.clangd = {} - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "c" }) + end + end, + }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.clang_check, + null_ls.builtins.diagnostics.cppcheck, + null_ls.builtins.diagnostics.cpplint, + }) + end + end, + }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.clangd = {} + end + end, + }, } diff --git a/lua/plugins/lang/dockerfile.lua b/lua/plugins/lang/dockerfile.lua index ca3ccc2..9f85765 100644 --- a/lua/plugins/lang/dockerfile.lua +++ b/lua/plugins/lang/dockerfile.lua @@ -1,24 +1,24 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "dockerfile" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "dockerfile" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.hadolint, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.hadolint, + }) + end + end, + }, } diff --git a/lua/plugins/lang/go.lua b/lua/plugins/lang/go.lua index 7e7fa03..becddf8 100644 --- a/lua/plugins/lang/go.lua +++ b/lua/plugins/lang/go.lua @@ -1,65 +1,66 @@ return { - { - "fatih/vim-go", - init = function() - vim.g.go_fmt_command = "gofumpt" - end, - ft = { "go" }, - }, + { + "fatih/vim-go", + init = function() + vim.g.go_fmt_command = "gofumpt" + end, + ft = { "go" }, + }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "go", - "gomod", - "gosum", - }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { + "go", + "gomod", + "gosum", + }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.golangci_lint, - null_ls.builtins.formatting.gofumpt, -- Just here because gopls integrated gofumpt doesn't work - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.golangci_lint, + null_ls.builtins.formatting.gofumpt, -- Just here because gopls integrated gofumpt doesn't work + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.gopls = { - -- Because integrated gofumpt doesn't work - -- I disable formatting for gopls - -- Formatting is handled with gofumpt by: - -- - null-ls on format request - -- - vim-go on save - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - end, - cmd = { "gopls", "-remote=auto", "serve" }, -- Shared with vim-go's gopls instance - settings = { - gopls = { - buildFlags = { "-tags=integration,unit" }, -- To make packages with those build flags actually work with the LSP - semanticTokens = false, - gofumpt = true, -- gofumpt formatting, doesn't work - }, - }, - } - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.gopls = { + -- Because integrated gofumpt doesn't work + -- I disable formatting for gopls + -- Formatting is handled with gofumpt by: + -- - null-ls on format request + -- - vim-go on save + on_attach = function(client, _) + client.server_capabilities.documentFormattingProvider = false + client.server_capabilities.documentRangeFormattingProvider = + false + end, + cmd = { "gopls", "-remote=auto", "serve" }, -- Shared with vim-go's gopls instance + settings = { + gopls = { + buildFlags = { "-tags=integration,unit" }, -- To make packages with those build flags actually work with the LSP + semanticTokens = false, + gofumpt = true, -- gofumpt formatting, doesn't work + }, + }, + } + end + end, + }, } diff --git a/lua/plugins/lang/groovy.lua b/lua/plugins/lang/groovy.lua index 1ab404d..020daa2 100644 --- a/lua/plugins/lang/groovy.lua +++ b/lua/plugins/lang/groovy.lua @@ -1,38 +1,40 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "groovy" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "groovy" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.npm_groovy_lint, - null_ls.builtins.formatting.npm_groovy_lint, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.npm_groovy_lint, + null_ls.builtins.formatting.npm_groovy_lint, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - local groovyls_path = "/Users/christian.segundo/git/groovy-language-server" - local groovyls_app_path = "build/libs/app-all.jar" - local groovyls_cmd = { "java", "-jar", groovyls_path .. "/" .. groovyls_app_path } - opts.servers.groovyls = { cmd = groovyls_cmd } - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + local groovyls_path = + "/Users/christian.segundo/git/groovy-language-server" + local groovyls_app_path = "build/libs/app-all.jar" + local groovyls_cmd = + { "java", "-jar", groovyls_path .. "/" .. groovyls_app_path } + opts.servers.groovyls = { cmd = groovyls_cmd } + end + end, + }, } diff --git a/lua/plugins/lang/helm.lua b/lua/plugins/lang/helm.lua index 6b303ec..eed7b3d 100644 --- a/lua/plugins/lang/helm.lua +++ b/lua/plugins/lang/helm.lua @@ -1,6 +1,6 @@ return { - { - "towolf/vim-helm", - ft = { "yaml" }, - }, + { + "towolf/vim-helm", + ft = { "yaml" }, + }, } diff --git a/lua/plugins/lang/jq.lua b/lua/plugins/lang/jq.lua index a9a41c6..7123ae8 100644 --- a/lua/plugins/lang/jq.lua +++ b/lua/plugins/lang/jq.lua @@ -1,21 +1,21 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "jq" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "jq" }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.jqls = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.jqls = {} + end + end, + }, } diff --git a/lua/plugins/lang/json.lua b/lua/plugins/lang/json.lua index 1c33afb..bdecb7f 100644 --- a/lua/plugins/lang/json.lua +++ b/lua/plugins/lang/json.lua @@ -1,27 +1,28 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "json" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "json" }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.jsonls = { - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = true - client.server_capabilities.documentRangeFormattingProvider = true - end, - cmd = { "vscode-json-language-server", "--stdio" }, - } - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.jsonls = { + on_attach = function(client, _) + client.server_capabilities.documentFormattingProvider = true + client.server_capabilities.documentRangeFormattingProvider = + true + end, + cmd = { "vscode-json-language-server", "--stdio" }, + } + end + end, + }, } diff --git a/lua/plugins/lang/jsonnet.lua b/lua/plugins/lang/jsonnet.lua index dff2e4b..c6663d0 100644 --- a/lua/plugins/lang/jsonnet.lua +++ b/lua/plugins/lang/jsonnet.lua @@ -1,26 +1,26 @@ return { - { - "google/vim-jsonnet", - ft = { "jsonnet" }, - }, + { + "google/vim-jsonnet", + ft = { "jsonnet" }, + }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "jsonnet" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "jsonnet" }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.jsonnet_ls = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.jsonnet_ls = {} + end + end, + }, } diff --git a/lua/plugins/lang/ledger.lua b/lua/plugins/lang/ledger.lua index bc265e1..dcd6a0f 100644 --- a/lua/plugins/lang/ledger.lua +++ b/lua/plugins/lang/ledger.lua @@ -1,25 +1,25 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "ledger" }) - end - end, - }, - { - "ledger/vim-ledger", - ft = { "ldg", "ledger", "journal" }, - }, - -- TODO - --{ - --"hrsh7th/nvim-cmp", - --opts = function(_, opts) - --if type(opts) == "table" then - --opts.sources = opts.sources or {} - --vim.list_extend(opts.sources, { name = "ledger" }) - --end - --end, - --}, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "ledger" }) + end + end, + }, + { + "ledger/vim-ledger", + ft = { "ldg", "ledger", "journal" }, + }, + -- TODO + --{ + --"hrsh7th/nvim-cmp", + --opts = function(_, opts) + --if type(opts) == "table" then + --opts.sources = opts.sources or {} + --vim.list_extend(opts.sources, { name = "ledger" }) + --end + --end, + --}, } diff --git a/lua/plugins/lang/lua.lua b/lua/plugins/lang/lua.lua index 5e08867..a6ac64e 100644 --- a/lua/plugins/lang/lua.lua +++ b/lua/plugins/lang/lua.lua @@ -1,46 +1,47 @@ return { - { "folke/neodev.nvim", lazy = true, opts = {} }, + -- { "folke/neodev.nvim", lazy = true, opts = {} }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "lua" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "lua" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.selene, - null_ls.builtins.formatting.stylua, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.selene, + null_ls.builtins.formatting.stylua, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.on_attach = opts.on_attach or {} - opts.servers.lua_ls = { - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - end, - } - end - end, - dependencies = { - "folke/neodev.nvim", - }, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.on_attach = opts.on_attach or {} + opts.servers.lua_ls = { + on_attach = function(client, _) + client.server_capabilities.documentFormattingProvider = false + client.server_capabilities.documentRangeFormattingProvider = + false + end, + } + end + end, + -- dependencies = { + -- "folke/neodev.nvim", + -- }, + }, } diff --git a/lua/plugins/lang/markdown.lua b/lua/plugins/lang/markdown.lua index 9025fc6..5731ff2 100644 --- a/lua/plugins/lang/markdown.lua +++ b/lua/plugins/lang/markdown.lua @@ -1,87 +1,111 @@ return { - { - "iamcco/markdown-preview.nvim", - build = "cd app && npm install", - init = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, + { + "iamcco/markdown-preview.nvim", + build = "cd app && npm install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }, - { - "mzlogin/vim-markdown-toc", - init = function() - vim.g.vmt_auto_update_on_save = 0 - vim.g.vmt_dont_insert_fence = 1 - end, - ft = { "markdown" }, - }, + { + "mzlogin/vim-markdown-toc", + init = function() + vim.g.vmt_auto_update_on_save = 0 + vim.g.vmt_dont_insert_fence = 1 + end, + ft = { "markdown" }, + }, - { - "dbridges/vim-markdown-runner", - cmd = { "MarkdownRunner", "MarkdownRunnerInsert" }, - config = function() - vim.api.nvim_set_keymap( - "n", - "r", - "MarkdownRunner", - { noremap = false, silent = true } - ) - vim.api.nvim_set_keymap( - "n", - "R", - "MarkdownRunnerInsert", - { noremap = false, silent = true } - ) - end, - ft = { "markdown" }, - }, + -- { + -- "dbridges/vim-markdown-runner", + -- cmd = { "MarkdownRunner", "MarkdownRunnerInsert" }, + -- config = function() + -- vim.api.nvim_set_keymap( + -- "n", + -- "r", + -- "MarkdownRunner", + -- { noremap = false, silent = true } + -- ) + -- vim.api.nvim_set_keymap( + -- "n", + -- "R", + -- "MarkdownRunnerInsert", + -- { noremap = false, silent = true } + -- ) + -- end, + -- ft = { "markdown" }, + -- }, - { - "preservim/vim-markdown", - dependencies = { "godlygeek/tabular" }, - init = function() - -- concealing is shit - vim.g.vim_markdown_conceal = 0 - vim.g.vim_markdown_conceal_code_blocks = 0 - vim.g.vim_markdown_frontmatter = 0 - vim.g.vim_markdown_strikethrough = 0 + { + "preservim/vim-markdown", + dependencies = { "godlygeek/tabular" }, + init = function() + -- concealing is shit + vim.g.vim_markdown_conceal = 0 + vim.g.vim_markdown_conceal_code_blocks = 0 + vim.g.vim_markdown_frontmatter = 0 + vim.g.vim_markdown_strikethrough = 0 - vim.g.vim_markdown_auto_insert_bullets = 0 - vim.g.vim_markdown_new_list_item_indent = 0 - vim.g.vim_markdown_folding_disabled = 1 - end, - ft = { "markdown" }, - }, + vim.g.vim_markdown_auto_insert_bullets = 0 + vim.g.vim_markdown_new_list_item_indent = 0 + vim.g.vim_markdown_folding_disabled = 1 + end, + ft = { "markdown" }, + }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "markdown_inline", - "markdown", - }) - end - end, - }, + -- { + -- "nvim-treesitter/nvim-treesitter", + -- opts = function(_, opts) + -- if type(opts) == "table" then + -- opts.ensure_installed = opts.ensure_installed or {} + -- vim.list_extend(opts.ensure_installed, { + -- "markdown_inline", + -- "markdown", + -- }) + -- end + -- end, + -- }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.markdownlint_cli2, - null_ls.builtins.diagnostics.vale, - null_ls.builtins.diagnostics.proselint, - null_ls.builtins.formatting.prettierd.with({ - filetypes = { "markdown" }, - }), - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.markdownlint_cli2, + null_ls.builtins.diagnostics.vale, + null_ls.builtins.diagnostics.proselint, + null_ls.builtins.formatting.prettierd.with({ + filetypes = { "markdown" }, + }), + }) + end + end, + }, + + -- { + -- "neovim/nvim-lspconfig", + -- opts = function(_, opts) + -- if type(opts) == "table" then + -- local mdspell = { + -- lintCommand = "mdspell --picky -u http://192.168.0.2:8010/v2/check ${INPUT}", + -- lintIgnoreExitCode = true, + -- lintFormats = { "%f:%l:%c:%m" }, + -- } + -- + -- opts.servers = opts.servers or {} + -- opts.servers.efm = + -- vim.tbl_deep_extend("error", opts.servers.efm or {}, { + -- filetypes = { "markdown" }, + -- settings = { + -- languages = { + -- markdown = { mdspell }, + -- }, + -- }, + -- }) + -- end + -- end, + -- }, } diff --git a/lua/plugins/lang/nix.lua b/lua/plugins/lang/nix.lua index bc373b7..3eca0ee 100644 --- a/lua/plugins/lang/nix.lua +++ b/lua/plugins/lang/nix.lua @@ -1,36 +1,36 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "nix" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "nix" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.code_actions.statix, - null_ls.builtins.diagnostics.deadnix, - null_ls.builtins.formatting.nixpkgs_fmt, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.code_actions.statix, + null_ls.builtins.diagnostics.deadnix, + null_ls.builtins.formatting.nixpkgs_fmt, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.nixd = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.nixd = {} + end + end, + }, } diff --git a/lua/plugins/lang/perl.lua b/lua/plugins/lang/perl.lua index 6ec7220..5b9953f 100644 --- a/lua/plugins/lang/perl.lua +++ b/lua/plugins/lang/perl.lua @@ -1,36 +1,38 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "perl" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "perl" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - -- perlls is supposed to use perltidy for formatting, but it doesn't - -- work not sure why. - null_ls.builtins.formatting.perltidy, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + -- perlls is supposed to use perltidy for formatting, but it doesn't + -- work not sure why. + null_ls.builtins.formatting.perltidy, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.perlls = {} - end - end, - }, + -- Broken because of C++17, see https://github.com/goccy/p5-Compiler-Lexer/issues/89 + -- Should be fixed by generating gperf files again with 3.1, see https://savannah.gnu.org/bugs/?53028 + -- { + -- "neovim/nvim-lspconfig", + -- opts = function(_, opts) + -- if type(opts) == "table" then + -- opts.servers = opts.servers or {} + -- opts.servers.perlls = {} + -- end + -- end, + -- }, } diff --git a/lua/plugins/lang/promql.lua b/lua/plugins/lang/promql.lua index 6b29ee3..79ec72a 100644 --- a/lua/plugins/lang/promql.lua +++ b/lua/plugins/lang/promql.lua @@ -1,19 +1,19 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "promql" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "promql" }) + end + end, + }, - { - name = "promqlfmt", - url = "https://git.segundo.io/nvim/promqlfmt", - --dir = "/Users/christian.segundo/git/promql.nvim", - --dev = true, - cmd = { "Promqlfmt" }, - }, + { + name = "promqlfmt", + url = "https://git.segundo.io/nvim/promqlfmt", + --dir = "/Users/christian.segundo/git/promql.nvim", + --dev = true, + cmd = { "Promqlfmt" }, + }, } diff --git a/lua/plugins/lang/python.lua b/lua/plugins/lang/python.lua index c95d4a7..d1f89d9 100644 --- a/lua/plugins/lang/python.lua +++ b/lua/plugins/lang/python.lua @@ -1,20 +1,20 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "python" }) - end - end, - }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.pyright = {} - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "python" }) + end + end, + }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.pyright = {} + end + end, + }, } diff --git a/lua/plugins/lang/swift.lua b/lua/plugins/lang/swift.lua index d7f6d33..aa3a6ef 100644 --- a/lua/plugins/lang/swift.lua +++ b/lua/plugins/lang/swift.lua @@ -1,35 +1,35 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "swift" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "swift" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.swiftlint, - null_ls.builtins.formatting.swiftformat, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.swiftlint, + null_ls.builtins.formatting.swiftformat, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.sourcekit = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.sourcekit = {} + end + end, + }, } diff --git a/lua/plugins/lang/terraform.lua b/lua/plugins/lang/terraform.lua index e7ccff4..1bf5b6e 100644 --- a/lua/plugins/lang/terraform.lua +++ b/lua/plugins/lang/terraform.lua @@ -1,40 +1,40 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "hcl", - "terraform", - }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { + "hcl", + "terraform", + }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.tfsec, - null_ls.builtins.formatting.terraform_fmt.with({ - extra_filetypes = { "hcl" }, - }), - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.tfsec, + null_ls.builtins.formatting.terraform_fmt.with({ + extra_filetypes = { "hcl" }, + }), + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.terraformls = {} - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.servers.terraformls = {} + end + end, + }, } diff --git a/lua/plugins/lang/typescript.lua b/lua/plugins/lang/typescript.lua deleted file mode 100644 index f21c876..0000000 --- a/lua/plugins/lang/typescript.lua +++ /dev/null @@ -1,34 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "typescript", "javascript" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.code_actions.eslint_d, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.tsserver = {} - end - end, - }, -} diff --git a/lua/plugins/lang/yaml.lua b/lua/plugins/lang/yaml.lua index f4b34aa..522dee4 100644 --- a/lua/plugins/lang/yaml.lua +++ b/lua/plugins/lang/yaml.lua @@ -1,59 +1,59 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "yaml" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "yaml" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.yamllint, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.diagnostics.yamllint, + }) + end + end, + }, - --{ - ----"someone-stole-my-name/yaml-companion.nvim", - --dev = true, - --dir = "/Users/christian.segundo/git/nvim_plugins/yaml-companion.nvim", - --dependencies = { - --"nvim-lua/plenary.nvim", - --"nvim-telescope/telescope.nvim", - --}, - --init = function() - --require("telescope").load_extension("yaml_schema") - --end, - --ft = { "yaml" }, - --}, + --{ + ----"someone-stole-my-name/yaml-companion.nvim", + --dev = true, + --dir = "/Users/christian.segundo/git/nvim_plugins/yaml-companion.nvim", + --dependencies = { + --"nvim-lua/plenary.nvim", + --"nvim-telescope/telescope.nvim", + --}, + --init = function() + --require("telescope").load_extension("yaml_schema") + --end, + --ft = { "yaml" }, + --}, - { - "neovim/nvim-lspconfig", - --dependencies = { "someone-stole-my-name/yaml-companion.nvim" }, - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - --opts.servers.yamlls = require("yaml-companion").setup() - end - end, - }, + { + "neovim/nvim-lspconfig", + --dependencies = { "someone-stole-my-name/yaml-companion.nvim" }, + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + --opts.servers.yamlls = require("yaml-companion").setup() + end + end, + }, - { - "rafamadriz/friendly-snippets", - opts = function(_, opts) - if type(opts) == "table" then - opts.include = opts.include or {} - vim.list_extend(opts.include, { "yaml" }) - end - end, - }, + { + "rafamadriz/friendly-snippets", + opts = function(_, opts) + if type(opts) == "table" then + opts.include = opts.include or {} + vim.list_extend(opts.include, { "yaml" }) + end + end, + }, } diff --git a/lua/plugins/lang/zig.lua b/lua/plugins/lang/zig.lua index 1970797..3954ca6 100644 --- a/lua/plugins/lang/zig.lua +++ b/lua/plugins/lang/zig.lua @@ -1,40 +1,41 @@ return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "zig" }) - end - end, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts) == "table" then + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "zig" }) + end + end, + }, - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.formatting.zigfmt, - }) - end - end, - }, + { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, opts) + if type(opts) == "table" then + opts.sources = opts.sources or {} + local null_ls = require("null-ls") + vim.list_extend(opts.sources, { + null_ls.builtins.formatting.zigfmt, + }) + end + end, + }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.on_attach = opts.on_attach or {} - opts.servers.zls = { - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - end, - } - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + opts.on_attach = opts.on_attach or {} + opts.servers.zls = { + on_attach = function(client, _) + client.server_capabilities.documentFormattingProvider = false + client.server_capabilities.documentRangeFormattingProvider = + false + end, + } + end + end, + }, } -- cgit v1.2.3