summaryrefslogtreecommitdiff
path: root/lua/plugins
diff options
context:
space:
mode:
authorChristian Segundo2024-12-08 13:06:41 +0100
committerChristian Segundo2024-12-08 13:06:41 +0100
commita459ffd8135d27499a616f5405468a1b20677223 (patch)
tree4a40f775e8f758d1c32636deb0b593de1ea14de4 /lua/plugins
parentb0a97cff0312d0634442147bbe4a8c63c9e81e3d (diff)
downloadconfig-a459ffd8135d27499a616f5405468a1b20677223.tar.gz
misc stylua
Diffstat (limited to 'lua/plugins')
-rw-r--r--lua/plugins/core/auto-session.lua8
-rw-r--r--lua/plugins/core/gitsigns.lua12
-rw-r--r--lua/plugins/core/luasnip.lua86
-rw-r--r--lua/plugins/core/nvim-tree.lua62
-rw-r--r--lua/plugins/core/tabline.lua2
-rw-r--r--lua/plugins/core/telescope.lua60
-rw-r--r--lua/plugins/core/tmux.lua42
-rw-r--r--lua/plugins/core/treesitter.lua94
-rw-r--r--lua/plugins/core/which-key.lua102
-rw-r--r--lua/plugins/extra/copilot.lua58
-rw-r--r--lua/plugins/extra/vim-easy-align.lua24
-rw-r--r--lua/plugins/extra/vim-fugitive.lua22
-rw-r--r--lua/plugins/eyecandy/fidget.lua4
-rw-r--r--lua/plugins/eyecandy/indent-blankline.lua40
-rw-r--r--lua/plugins/eyecandy/themes.lua88
-rw-r--r--lua/plugins/eyecandy/vim-illuminate.lua4
-rw-r--r--lua/plugins/eyecandy/virt-column.lua10
-rw-r--r--lua/plugins/lang/ansible.lua44
-rw-r--r--lua/plugins/lang/bash.lua76
-rw-r--r--lua/plugins/lang/c.lua64
-rw-r--r--lua/plugins/lang/dockerfile.lua42
-rw-r--r--lua/plugins/lang/go.lua121
-rw-r--r--lua/plugins/lang/groovy.lua70
-rw-r--r--lua/plugins/lang/helm.lua8
-rw-r--r--lua/plugins/lang/jq.lua36
-rw-r--r--lua/plugins/lang/json.lua49
-rw-r--r--lua/plugins/lang/jsonnet.lua44
-rw-r--r--lua/plugins/lang/ledger.lua46
-rw-r--r--lua/plugins/lang/lua.lua83
-rw-r--r--lua/plugins/lang/markdown.lua182
-rw-r--r--lua/plugins/lang/nix.lua64
-rw-r--r--lua/plugins/lang/perl.lua66
-rw-r--r--lua/plugins/lang/promql.lua32
-rw-r--r--lua/plugins/lang/python.lua36
-rw-r--r--lua/plugins/lang/swift.lua62
-rw-r--r--lua/plugins/lang/terraform.lua72
-rw-r--r--lua/plugins/lang/typescript.lua34
-rw-r--r--lua/plugins/lang/yaml.lua106
-rw-r--r--lua/plugins/lang/zig.lua73
-rw-r--r--lua/plugins/lsp/cmp.lua194
-rw-r--r--lua/plugins/lsp/config.lua88
-rw-r--r--lua/plugins/lsp/null-ls.lua6
-rw-r--r--lua/plugins/lsp/trouble.lua14
43 files changed, 1232 insertions, 1198 deletions
diff --git a/lua/plugins/core/auto-session.lua b/lua/plugins/core/auto-session.lua
index 9bfcac0..aeed968 100644
--- a/lua/plugins/core/auto-session.lua
+++ b/lua/plugins/core/auto-session.lua
@@ -1,6 +1,6 @@
return {
- "rmagatti/auto-session",
- config = function()
- require("auto-session").setup({ log_level = "info" })
- end,
+ "rmagatti/auto-session",
+ config = function()
+ require("auto-session").setup({ log_level = "info" })
+ end,
}
diff --git a/lua/plugins/core/gitsigns.lua b/lua/plugins/core/gitsigns.lua
index e856855..8373701 100644
--- a/lua/plugins/core/gitsigns.lua
+++ b/lua/plugins/core/gitsigns.lua
@@ -1,8 +1,8 @@
return {
- "lewis6991/gitsigns.nvim",
- event = { "BufRead" },
- config = function()
- require("gitsigns").setup()
- end,
- dependencies = { "nvim-lua/plenary.nvim" },
+ "lewis6991/gitsigns.nvim",
+ event = { "BufRead" },
+ config = function()
+ require("gitsigns").setup()
+ end,
+ dependencies = { "nvim-lua/plenary.nvim" },
}
diff --git a/lua/plugins/core/luasnip.lua b/lua/plugins/core/luasnip.lua
index 622af58..3761578 100644
--- a/lua/plugins/core/luasnip.lua
+++ b/lua/plugins/core/luasnip.lua
@@ -1,50 +1,52 @@
return {
- {
- "L3MON4D3/LuaSnip",
- dependencies = { "rafamadriz/friendly-snippets" },
- build = "make install_jsregexp",
- config = function()
- local ls = require("luasnip")
- local types = require("luasnip.util.types")
+ {
+ "L3MON4D3/LuaSnip",
+ dependencies = { "rafamadriz/friendly-snippets" },
+ build = "make install_jsregexp",
+ config = function()
+ local ls = require("luasnip")
+ local types = require("luasnip.util.types")
- ls.config.set_config({
- history = true,
- updateevents = "TextChanged,TextChangedI",
- enable_autosnippets = true,
- ext_opts = {
- [types.choiceNode] = {
- active = {
- virt_text = { { "<-", "Error" } },
- },
- },
- },
- })
+ ls.config.set_config({
+ history = true,
+ updateevents = "TextChanged,TextChangedI",
+ enable_autosnippets = true,
+ ext_opts = {
+ [types.choiceNode] = {
+ active = {
+ virt_text = { { "<-", "Error" } },
+ },
+ },
+ },
+ })
- -- luasnip keymaps are defined as cmp keymaps
+ -- luasnip keymaps are defined as cmp keymaps
- vim.keymap.set(
- "n",
- "<leader><leader>s",
- '<cmd>lua require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })<CR>'
- )
+ vim.keymap.set(
+ "n",
+ "<leader><leader>s",
+ '<cmd>lua require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })<CR>'
+ )
- require("luasnip.loaders.from_lua").lazy_load({ paths = "~/.config/nvim/lua/snippets" })
- end,
- },
+ require("luasnip.loaders.from_lua").lazy_load({
+ paths = "~/.config/nvim/lua/snippets",
+ })
+ end,
+ },
- -- VSCode like (JSON) snippets
- -- For the full list of supported languages see:
- -- https://github.com/rafamadriz/friendly-snippets/blob/main/package.json
- {
- "rafamadriz/friendly-snippets",
- opts = { include = {} },
- config = function(_, opts)
- if #opts.include == 0 then
- return
- end
+ -- VSCode like (JSON) snippets
+ -- For the full list of supported languages see:
+ -- https://github.com/rafamadriz/friendly-snippets/blob/main/package.json
+ {
+ "rafamadriz/friendly-snippets",
+ opts = { include = {} },
+ config = function(_, opts)
+ if #opts.include == 0 then
+ return
+ end
- opts.path = "~/.local/share/nvim/lazy/friendly-snippets"
- require("luasnip.loaders.from_vscode").lazy_load(opts)
- end,
- },
+ opts.path = "~/.local/share/nvim/lazy/friendly-snippets"
+ require("luasnip.loaders.from_vscode").lazy_load(opts)
+ end,
+ },
}
diff --git a/lua/plugins/core/nvim-tree.lua b/lua/plugins/core/nvim-tree.lua
index 36305d0..08efb3e 100644
--- a/lua/plugins/core/nvim-tree.lua
+++ b/lua/plugins/core/nvim-tree.lua
@@ -1,36 +1,36 @@
return {
- {
- "nvim-tree/nvim-tree.lua",
- config = function()
- require("nvim-tree").setup({
- sync_root_with_cwd = false,
- update_focused_file = {
- enable = true,
- update_root = false,
- },
- renderer = {
- indent_markers = { enable = true },
- highlight_git = true,
- highlight_opened_files = "all",
- },
- })
- end,
- dependencies = { "nvim-tree/nvim-web-devicons" },
- },
+ {
+ "nvim-tree/nvim-tree.lua",
+ config = function()
+ require("nvim-tree").setup({
+ sync_root_with_cwd = false,
+ update_focused_file = {
+ enable = true,
+ update_root = false,
+ },
+ renderer = {
+ indent_markers = { enable = true },
+ highlight_git = true,
+ highlight_opened_files = "all",
+ },
+ })
+ end,
+ dependencies = { "nvim-tree/nvim-web-devicons" },
+ },
- -- Add nvim-tree which-key shortcuts
- {
- "folke/which-key.nvim",
- opts = function(_, opts)
- if type(opts) ~= "table" then
- opts = {}
- end
+ -- Add nvim-tree which-key shortcuts
+ {
+ "folke/which-key.nvim",
+ opts = function(_, opts)
+ if type(opts) ~= "table" then
+ opts = {}
+ end
- if type(opts.f) ~= "table" then
- opts["f"] = {}
- end
+ if type(opts.f) ~= "table" then
+ opts["f"] = {}
+ end
- opts.f["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" }
- end,
- },
+ opts.f["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" }
+ end,
+ },
}
diff --git a/lua/plugins/core/tabline.lua b/lua/plugins/core/tabline.lua
index 0a8305d..280d5a3 100644
--- a/lua/plugins/core/tabline.lua
+++ b/lua/plugins/core/tabline.lua
@@ -1,3 +1,3 @@
return {
- "mkitt/tabline.vim",
+ "mkitt/tabline.vim",
}
diff --git a/lua/plugins/core/telescope.lua b/lua/plugins/core/telescope.lua
index 92d2ef2..1560442 100644
--- a/lua/plugins/core/telescope.lua
+++ b/lua/plugins/core/telescope.lua
@@ -1,34 +1,34 @@
return {
- {
- "nvim-telescope/telescope.nvim",
- config = function()
- require("telescope").load_extension("file_browser")
- end,
- dependencies = {
- "nvim-lua/plenary.nvim",
- "nvim-telescope/telescope-file-browser.nvim",
- },
- },
+ {
+ "nvim-telescope/telescope.nvim",
+ config = function()
+ require("telescope").load_extension("file_browser")
+ end,
+ dependencies = {
+ "nvim-lua/plenary.nvim",
+ "nvim-telescope/telescope-file-browser.nvim",
+ },
+ },
- {
- "folke/which-key.nvim",
- opts = function(_, opts)
- if type(opts) == "table" then
- opts.b = opts.b or {}
- opts.f = opts.f or {}
+ {
+ "folke/which-key.nvim",
+ opts = function(_, opts)
+ if type(opts) == "table" then
+ opts.b = opts.b or {}
+ opts.f = opts.f or {}
- opts.b["b"] = { "<cmd>Telescope buffers<cr>", "All" }
- opts.f["f"] = { "<cmd>Telescope find_files<cr>", "Find" }
- opts.f["g"] = {
- function()
- require("telescope.builtin").live_grep({
- additional_args = { "--hidden" },
- })
- end,
- "Grep",
- }
- opts.f["b"] = { "<cmd>Telescope file_browser<cr>", "Browse" }
- end
- end,
- },
+ opts.b["b"] = { "<cmd>Telescope buffers<cr>", "All" }
+ opts.f["f"] = { "<cmd>Telescope find_files<cr>", "Find" }
+ opts.f["g"] = {
+ function()
+ require("telescope.builtin").live_grep({
+ additional_args = { "--hidden" },
+ })
+ end,
+ "Grep",
+ }
+ opts.f["b"] = { "<cmd>Telescope file_browser<cr>", "Browse" }
+ end
+ end,
+ },
}
diff --git a/lua/plugins/core/tmux.lua b/lua/plugins/core/tmux.lua
index 0d63aa4..dde127f 100644
--- a/lua/plugins/core/tmux.lua
+++ b/lua/plugins/core/tmux.lua
@@ -1,13 +1,33 @@
return {
- "christoomey/vim-tmux-navigator",
- config = function()
- local nvim_set_keymap = vim.api.nvim_set_keymap
- vim.g.tmux_navigator_no_mappings = 1
- for _, mode in pairs({ "n", "v", "i", "t" }) do
- nvim_set_keymap(mode, "<C-j>", "<cmd>:TmuxNavigateDown<CR>", { noremap = true })
- nvim_set_keymap(mode, "<C-k>", "<cmd>:TmuxNavigateUp<CR>", { noremap = true })
- nvim_set_keymap(mode, "<C-h>", "<cmd>:TmuxNavigateLeft<CR>", { noremap = true })
- nvim_set_keymap(mode, "<C-l>", "<cmd>:TmuxNavigateRight<CR>", { noremap = true })
- end
- end,
+ "christoomey/vim-tmux-navigator",
+ config = function()
+ local nvim_set_keymap = vim.api.nvim_set_keymap
+ vim.g.tmux_navigator_no_mappings = 1
+ for _, mode in pairs({ "n", "v", "i", "t" }) do
+ nvim_set_keymap(
+ mode,
+ "<C-j>",
+ "<cmd>:TmuxNavigateDown<CR>",
+ { noremap = true }
+ )
+ nvim_set_keymap(
+ mode,
+ "<C-k>",
+ "<cmd>:TmuxNavigateUp<CR>",
+ { noremap = true }
+ )
+ nvim_set_keymap(
+ mode,
+ "<C-h>",
+ "<cmd>:TmuxNavigateLeft<CR>",
+ { noremap = true }
+ )
+ nvim_set_keymap(
+ mode,
+ "<C-l>",
+ "<cmd>:TmuxNavigateRight<CR>",
+ { noremap = true }
+ )
+ end
+ end,
}
diff --git a/lua/plugins/core/treesitter.lua b/lua/plugins/core/treesitter.lua
index 065190f..f7b46b9 100644
--- a/lua/plugins/core/treesitter.lua
+++ b/lua/plugins/core/treesitter.lua
@@ -1,55 +1,55 @@
---@param tbl table
---@return table
local tbl_uniq = function(tbl)
- ---@type table<string, boolean>
- local added = {}
- local res = {}
- res = vim.tbl_filter(function(k)
- if added[k] then
- return false
- end
- added[k] = true
- return true
- end, tbl)
+ ---@type table<string, boolean>
+ local added = {}
+ local res = {}
+ res = vim.tbl_filter(function(k)
+ if added[k] then
+ return false
+ end
+ added[k] = true
+ return true
+ end, tbl)
- return res
+ return res
end
return {
- {
- "nvim-treesitter/nvim-treesitter",
- -- Disable for now, this has been a big source of pain and errors in the
- -- past
- enabled = false,
- build = ":TSUpdate",
- cmd = { "TSUpdateSync" },
- event = { "BufReadPost", "BufNewFile" },
- init = function()
- vim.o.foldmethod = "expr"
- vim.o.foldexpr = "nvim_treesitter#foldexpr()"
- end,
- opts = {
- indent = { enable = true },
- ensure_installed = { "query" },
- ignore_install = {},
- highlight = {
- enable = true,
- additional_vim_regex_highlighting = false,
- },
- query_linter = {
- enable = true,
- use_virtual_text = true,
- lint_events = { "BufWrite", "CursorHold" },
- },
- },
- config = function(_, opts)
- if type(opts.ensure_installed) == "table" then
- opts.ensure_installed = tbl_uniq(opts.ensure_installed)
- end
- if type(opts.ignore_install) == "table" then
- opts.ignore_install = tbl_uniq(opts.ignore_install)
- end
- require("nvim-treesitter.configs").setup(opts)
- end,
- },
+ {
+ "nvim-treesitter/nvim-treesitter",
+ -- Disable for now, this has been a big source of pain and errors in the
+ -- past
+ enabled = false,
+ build = ":TSUpdate",
+ cmd = { "TSUpdateSync" },
+ event = { "BufReadPost", "BufNewFile" },
+ init = function()
+ vim.o.foldmethod = "expr"
+ vim.o.foldexpr = "nvim_treesitter#foldexpr()"
+ end,
+ opts = {
+ indent = { enable = true },
+ ensure_installed = { "query" },
+ ignore_install = {},
+ highlight = {
+ enable = true,
+ additional_vim_regex_highlighting = false,
+ },
+ query_linter = {
+ enable = true,
+ use_virtual_text = true,
+ lint_events = { "BufWrite", "CursorHold" },
+ },
+ },
+ config = function(_, opts)
+ if type(opts.ensure_installed) == "table" then
+ opts.ensure_installed = tbl_uniq(opts.ensure_installed)
+ end
+ if type(opts.ignore_install) == "table" then
+ opts.ignore_install = tbl_uniq(opts.ignore_install)
+ end
+ require("nvim-treesitter.configs").setup(opts)
+ end,
+ },
}
diff --git a/lua/plugins/core/which-key.lua b/lua/plugins/core/which-key.lua
index 6513714..3c4a95b 100644
--- a/lua/plugins/core/which-key.lua
+++ b/lua/plugins/core/which-key.lua
@@ -1,52 +1,58 @@
return {
- "folke/which-key.nvim",
- event = "VeryLazy",
- init = function()
- vim.o.timeout = true
- vim.o.timeoutlen = 300
- end,
+ "folke/which-key.nvim",
+ event = "VeryLazy",
+ init = function()
+ vim.o.timeout = true
+ vim.o.timeoutlen = 300
+ end,
- opts = {
- f = { name = "File" },
- t = {
- name = "Tab",
- c = { "<cmd>tabnew<cr>", "Create" },
- ["1"] = { "1gt", "1" },
- ["2"] = { "2gt", "2" },
- ["3"] = { "3gt", "3" },
- ["4"] = { "4gt", "4" },
- ["5"] = { "5gt", "5" },
- ["6"] = { "6gt", "6" },
- ["7"] = { "7gt", "7" },
- ["8"] = { "8gt", "8" },
- ["9"] = { "9gt", "9" },
- },
- b = {
- name = "Buffer",
- n = { "<cmd>BufferNext<cr>", "Next" },
- p = { "<cmd>BufferPrevious<cr>", "Previous" },
- c = { "<cmd>BufferClose<cr>", "Close" },
- },
- l = {
- name = "LSP",
- a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
- f = {
- "<cmd>lua vim.lsp.buf.format({ async = false, timeout_ms = 5000 })<cr>",
- "Format",
- },
- d = { "<cmd>lua vim.diagnostic.open_float()<cr>", "Diagnostic" },
- h = { "<cmd>lua vim.lsp.buf.hover()<cr>", "Help" },
- g = {
- name = "Go to",
- D = { "<cmd>lua vim.lsp.buf.declaration()<cr>", "Go to declaration" },
- d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to definition" },
- i = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to implementation" },
- },
- },
- },
+ opts = {
+ f = { name = "File" },
+ t = {
+ name = "Tab",
+ c = { "<cmd>tabnew<cr>", "Create" },
+ ["1"] = { "1gt", "1" },
+ ["2"] = { "2gt", "2" },
+ ["3"] = { "3gt", "3" },
+ ["4"] = { "4gt", "4" },
+ ["5"] = { "5gt", "5" },
+ ["6"] = { "6gt", "6" },
+ ["7"] = { "7gt", "7" },
+ ["8"] = { "8gt", "8" },
+ ["9"] = { "9gt", "9" },
+ },
+ b = {
+ name = "Buffer",
+ n = { "<cmd>BufferNext<cr>", "Next" },
+ p = { "<cmd>BufferPrevious<cr>", "Previous" },
+ c = { "<cmd>BufferClose<cr>", "Close" },
+ },
+ l = {
+ name = "LSP",
+ a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
+ f = {
+ "<cmd>lua vim.lsp.buf.format({ async = false, timeout_ms = 5000 })<cr>",
+ "Format",
+ },
+ d = { "<cmd>lua vim.diagnostic.open_float()<cr>", "Diagnostic" },
+ h = { "<cmd>lua vim.lsp.buf.hover()<cr>", "Help" },
+ g = {
+ name = "Go to",
+ D = {
+ "<cmd>lua vim.lsp.buf.declaration()<cr>",
+ "Go to declaration",
+ },
+ d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to definition" },
+ i = {
+ "<cmd>lua vim.lsp.buf.definition()<cr>",
+ "Go to implementation",
+ },
+ },
+ },
+ },
- config = function(_, opts)
- local wk = require("which-key")
- wk.register(opts, { prefix = "<leader>" })
- end,
+ config = function(_, opts)
+ local wk = require("which-key")
+ wk.register(opts, { prefix = "<leader>" })
+ end,
}
diff --git a/lua/plugins/extra/copilot.lua b/lua/plugins/extra/copilot.lua
index 15d0c73..e538ccc 100644
--- a/lua/plugins/extra/copilot.lua
+++ b/lua/plugins/extra/copilot.lua
@@ -1,33 +1,33 @@
return {
- {
- "zbirenbaum/copilot.lua",
- event = { "InsertEnter" },
- build = ":Copilot auth",
- config = function()
- vim.schedule(function()
- require("copilot").setup({
- filetypes = { yaml = true },
- suggestion = { enabled = false },
- panel = { enabled = false },
- })
- end)
- end,
- },
+ {
+ "zbirenbaum/copilot.lua",
+ event = { "InsertEnter" },
+ build = ":Copilot auth",
+ config = function()
+ vim.schedule(function()
+ require("copilot").setup({
+ filetypes = { yaml = true },
+ suggestion = { enabled = false },
+ panel = { enabled = false },
+ })
+ end)
+ end,
+ },
- {
- "zbirenbaum/copilot-cmp",
- dependencies = { "copilot.lua" },
- opts = {},
- },
+ {
+ "zbirenbaum/copilot-cmp",
+ dependencies = { "copilot.lua" },
+ opts = {},
+ },
- {
- "hrsh7th/nvim-cmp",
- dependencies = { "zbirenbaum/copilot-cmp" },
- opts = function(_, opts)
- if type(opts) == "table" then
- table.insert(opts.sources, 1, { name = "copilot" })
- opts.formatting.format.menu["copilot"] = ""
- end
- end,
- },
+ {
+ "hrsh7th/nvim-cmp",
+ dependencies = { "zbirenbaum/copilot-cmp" },
+ opts = function(_, opts)
+ if type(opts) == "table" then
+ table.insert(opts.sources, 1, { name = "copilot" })
+ opts.formatting.format.menu["copilot"] = ""
+ end
+ end,
+ },
}
diff --git a/lua/plugins/extra/vim-easy-align.lua b/lua/plugins/extra/vim-easy-align.lua
index bdb081d..a63afe2 100644
--- a/lua/plugins/extra/vim-easy-align.lua
+++ b/lua/plugins/extra/vim-easy-align.lua
@@ -1,14 +1,14 @@
return {
- {
- "https://github.com/junegunn/vim-easy-align",
- keys = {
- {
- "ga",
- "<Plug>(EasyAlign)",
- mode = { "n", "x" },
- desc = "Align text",
- silent = true,
- },
- },
- },
+ {
+ "https://github.com/junegunn/vim-easy-align",
+ keys = {
+ {
+ "ga",
+ "<Plug>(EasyAlign)",
+ mode = { "n", "x" },
+ desc = "Align text",
+ silent = true,
+ },
+ },
+ },
}
diff --git a/lua/plugins/extra/vim-fugitive.lua b/lua/plugins/extra/vim-fugitive.lua
index d1f8a5a..70d3146 100644
--- a/lua/plugins/extra/vim-fugitive.lua
+++ b/lua/plugins/extra/vim-fugitive.lua
@@ -1,14 +1,14 @@
return {
- {
- "shumphrey/fugitive-gitlab.vim",
- cmd = "GBrowse",
- config = function()
- vim.g.fugitive_gitlab_domains = { "https://gitlab.otters.xyz" }
- end,
- },
+ {
+ "shumphrey/fugitive-gitlab.vim",
+ cmd = "GBrowse",
+ config = function()
+ vim.g.fugitive_gitlab_domains = { "https://gitlab.otters.xyz" }
+ end,
+ },
- {
- "tpope/vim-fugitive",
- dependencies = { "tpope/vim-rhubarb", "fugitive-gitlab.vim" },
- },
+ {
+ "tpope/vim-fugitive",
+ dependencies = { "tpope/vim-rhubarb", "fugitive-gitlab.vim" },
+ },
}
diff --git a/lua/plugins/eyecandy/fidget.lua b/lua/plugins/eyecandy/fidget.lua
index 610434d..eb58f02 100644
--- a/lua/plugins/eyecandy/fidget.lua
+++ b/lua/plugins/eyecandy/fidget.lua
@@ -1,4 +1,4 @@
return {
- "j-hui/fidget.nvim",
- opts = {},
+ "j-hui/fidget.nvim",
+ opts = {},
}
diff --git a/lua/plugins/eyecandy/indent-blankline.lua b/lua/plugins/eyecandy/indent-blankline.lua
index e49f777..2bb6dbc 100644
--- a/lua/plugins/eyecandy/indent-blankline.lua
+++ b/lua/plugins/eyecandy/indent-blankline.lua
@@ -1,22 +1,22 @@
return {
- -- "lukas-reineke/indent-blankline.nvim",
- -- event = { "BufRead" },
- -- main = "ibl",
- -- opts = {
- -- indent = {
- -- char = "▏",
- -- tab_char = "▏",
- -- },
- -- scope = {
- -- enabled = true,
- -- show_start = true,
- -- show_end = true,
- -- exclude = {
- -- language = {
- -- "help",
- -- },
- -- },
- -- },
- -- },
- -- dependencies = { "nvim-treesitter" },
+ -- "lukas-reineke/indent-blankline.nvim",
+ -- event = { "BufRead" },
+ -- main = "ibl",
+ -- opts = {
+ -- indent = {
+ -- char = "▏",
+ -- tab_char = "▏",
+ -- },
+ -- scope = {
+ -- enabled = true,
+ -- show_start = true,
+ -- show_end = true,
+ -- exclude = {
+ -- language = {
+ -- "help",
+ -- },
+ -- },
+ -- },
+ -- },
+ -- dependencies = { "nvim-treesitter" },
}
diff --git a/lua/plugins/eyecandy/themes.lua b/lua/plugins/eyecandy/themes.lua
index 118dbba..3d6414e 100644
--- a/lua/plugins/eyecandy/themes.lua
+++ b/lua/plugins/eyecandy/themes.lua
@@ -1,46 +1,46 @@
return {
- {
- "catppuccin/nvim",
- enabled = true,
- lazy = false,
- priority = 1000,
- name = "catppuccin",
- config = function()
- local catp = require("catppuccin")
- catp.setup({
- flavour = "frappe",
- integrations = {
- indent_blankline = true,
- which_key = true,
- illuminate = true,
- lsp_trouble = true,
- navic = {
- enabled = true,
- custom_bg = "NONE",
- },
- },
- })
- vim.api.nvim_command("colorscheme catppuccin")
- end,
- },
- {
- "projekt0n/github-nvim-theme",
- enabled = false,
- lazy = false,
- priority = 1000,
- config = function()
- require("github-theme").setup({})
- vim.api.nvim_command("colorscheme github_dark_dimmed")
- end,
- },
- {
- "ellisonleao/gruvbox.nvim",
- enabled = false,
- lazy = false,
- priority = 1000,
- config = function()
- require("gruvbox").setup({})
- vim.api.nvim_command("colorscheme gruvbox")
- end,
- },
+ {
+ "catppuccin/nvim",
+ enabled = true,
+ lazy = false,
+ priority = 1000,
+ name = "catppuccin",
+ config = function()
+ local catp = require("catppuccin")
+ catp.setup({
+ flavour = "frappe",
+ integrations = {
+ indent_blankline = true,
+ which_key = true,
+ illuminate = true,
+ lsp_trouble = true,
+ navic = {
+ enabled = true,
+ custom_bg = "NONE",
+ },
+ },
+ })
+ vim.api.nvim_command("colorscheme catppuccin")
+ end,
+ },
+ {
+ "projekt0n/github-nvim-theme",
+ enabled = false,
+ lazy = false,
+ priority = 1000,
+ config = function()
+ require("github-theme").setup({})
+ vim.api.nvim_command("colorscheme github_dark_dimmed")
+ end,
+ },
+ {
+ "ellisonleao/gruvbox.nvim",
+ enabled = false,
+ lazy = false,
+ priority = 1000,
+ config = function()
+ require("gruvbox").setup({})
+ vim.api.nvim_command("colorscheme gruvbox")
+ end,
+ },
}
diff --git a/lua/plugins/eyecandy/vim-illuminate.lua b/lua/plugins/eyecandy/vim-illuminate.lua
index 79ccfb5..c4bbac6 100644
--- a/lua/plugins/eyecandy/vim-illuminate.lua
+++ b/lua/plugins/eyecandy/vim-illuminate.lua
@@ -1,4 +1,4 @@
return {
- -- "RRethy/vim-illuminate",
- -- event = { "BufRead" },
+ -- "RRethy/vim-illuminate",
+ -- event = { "BufRead" },
}
diff --git a/lua/plugins/eyecandy/virt-column.lua b/lua/plugins/eyecandy/virt-column.lua
index 8221f61..6995a68 100644
--- a/lua/plugins/eyecandy/virt-column.lua
+++ b/lua/plugins/eyecandy/virt-column.lua
@@ -1,7 +1,7 @@
return {
- -- "lukas-reineke/virt-column.nvim",
- -- event = { "BufRead" },
- -- config = function()
- -- require("virt-column").setup()
- -- end,
+ -- "lukas-reineke/virt-column.nvim",
+ -- event = { "BufRead" },
+ -- config = function()
+ -- require("virt-column").setup()
+ -- end,
}
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",
- "<leader>r",
- "<cmd>MarkdownRunner<CR>",
- { noremap = false, silent = true }
- )
- vim.api.nvim_set_keymap(
- "n",
- "<leader>R",
- "<cmd>MarkdownRunnerInsert<CR>",
- { noremap = false, silent = true }
- )
- end,
- ft = { "markdown" },
- },
+ -- {
+ -- "dbridges/vim-markdown-runner",
+ -- cmd = { "MarkdownRunner", "MarkdownRunnerInsert" },
+ -- config = function()
+ -- vim.api.nvim_set_keymap(
+ -- "n",
+ -- "<leader>r",
+ -- "<cmd>MarkdownRunner<CR>",
+ -- { noremap = false, silent = true }
+ -- )
+ -- vim.api.nvim_set_keymap(
+ -- "n",
+ -- "<leader>R",
+ -- "<cmd>MarkdownRunnerInsert<CR>",
+ -- { 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,
+ },
}
diff --git a/lua/plugins/lsp/cmp.lua b/lua/plugins/lsp/cmp.lua
index 4b93ccf..890a813 100644
--- a/lua/plugins/lsp/cmp.lua
+++ b/lua/plugins/lsp/cmp.lua
@@ -1,102 +1,106 @@
return {
- "hrsh7th/nvim-cmp",
- opts = {
- sources = {
- { name = "ledger" },
- {
- name = "luasnip",
- option = {
- show_autosnippets = true,
- use_show_condition = true,
- },
- },
- { name = "nvim_lsp", priority = 1 },
- { name = "nvim_lsp_signature_help" },
- { name = "nvim_lua" },
- { name = "path" },
- { name = "emoji" },
+ "hrsh7th/nvim-cmp",
+ opts = {
+ sources = {
+ { name = "ledger" },
+ {
+ name = "luasnip",
+ option = {
+ show_autosnippets = true,
+ use_show_condition = true,
+ },
+ },
+ { name = "nvim_lsp", priority = 1 },
+ { name = "nvim_lsp_signature_help" },
+ { name = "nvim_lua" },
+ { name = "path" },
+ { name = "emoji" },
},
{ name = "abook" },
- format = {
- mode = "symbol_text",
- maxwidth = 50,
- before = function(entry, vim_item)
- return vim_item
- end,
- menu = {
- buffer = "[Buffer]",
- nvim_lsp = "[LSP]",
- luasnip = "[LuaSnip]",
- nvim_lua = "[Lua]",
- latex_symbols = "[Latex]",
- },
- },
+ },
+ formatting = {
+ format = {
+ mode = "symbol_text",
+ maxwidth = 50,
+ before = function(entry, vim_item)
+ return vim_item
+ end,
+ menu = {
+ buffer = "[Buffer]",
+ nvim_lsp = "[LSP]",
+ luasnip = "[LuaSnip]",
+ nvim_lua = "[Lua]",
+ latex_symbols = "[Latex]",
abook = "[Abook]",
- },
- config = function(_, opts)
- local cmp = require("cmp")
- local luasnip = require("luasnip")
- local lspkind = require("lspkind")
- cmp.setup({
- sources = opts.sources,
- --experimental = { ghost_text = { hl_group = "Comment" } },
- snippet = {
- expand = function(args)
- require("luasnip").lsp_expand(args.body)
- end,
- },
- formatting = { format = lspkind.cmp_format(opts.formatting.format) },
- mapping = {
- ["<C-p>"] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_prev_item()
- elseif luasnip.jumpable(-1) then
- luasnip.jump(-1)
- else
- fallback()
- end
- end, { "i", "s" }),
- ["<C-n>"] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_next_item()
- elseif luasnip.expand_or_jumpable() then
- luasnip.expand_or_jump()
- else
- fallback()
- end
- end, { "i", "s" }),
- ["<C-l>"] = cmp.mapping(function(fallback)
- if luasnip.choice_active() then
- luasnip.change_choice(1)
- else
- fallback()
- end
- end, { "i", "s" }),
- ["<C-d>"] = cmp.mapping.scroll_docs(-4),
- ["<C-f>"] = cmp.mapping.scroll_docs(4),
- ["<C-Space>"] = cmp.mapping.complete(),
- ["<C-e>"] = cmp.mapping.close(),
- ["<CR>"] = cmp.mapping.confirm({
- behavior = cmp.ConfirmBehavior.Insert,
- select = true, -- Automatically select first item on CR
- }),
- },
- })
- end,
- dependencies = {
- { "L3MON4D3/LuaSnip" },
- { "hrsh7th/cmp-emoji" },
- { "hrsh7th/cmp-nvim-lsp" },
- { "hrsh7th/cmp-nvim-lsp-signature-help" },
- { "hrsh7th/cmp-nvim-lua" },
- { "hrsh7th/cmp-path" },
- { "onsails/lspkind.nvim" },
- { "saadparwaiz1/cmp_luasnip" },
- { "someone-stole-my-name/cmp-ledger" },
- },
+ },
+ },
+ },
+ },
+ config = function(_, opts)
+ local cmp = require("cmp")
+ local luasnip = require("luasnip")
+ local lspkind = require("lspkind")
+ cmp.setup({
+ sources = opts.sources,
+ --experimental = { ghost_text = { hl_group = "Comment" } },
+ snippet = {
+ expand = function(args)
+ require("luasnip").lsp_expand(args.body)
+ end,
+ },
+ formatting = { format = lspkind.cmp_format(opts.formatting.format) },
+ mapping = {
+ ["<C-p>"] = cmp.mapping(function(fallback)
+ if cmp.visible() then
+ cmp.select_prev_item()
+ elseif luasnip.jumpable(-1) then
+ luasnip.jump(-1)
+ else
+ fallback()
+ end
+ end, { "i", "s" }),
+ ["<C-n>"] = cmp.mapping(function(fallback)
+ if cmp.visible() then
+ cmp.select_next_item()
+ elseif luasnip.expand_or_jumpable() then
+ luasnip.expand_or_jump()
+ else
+ fallback()
+ end
+ end, { "i", "s" }),
+ ["<C-l>"] = cmp.mapping(function(fallback)
+ if luasnip.choice_active() then
+ luasnip.change_choice(1)
+ else
+ fallback()
+ end
+ end, { "i", "s" }),
+ ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+ ["<C-f>"] = cmp.mapping.scroll_docs(4),
+ ["<C-Space>"] = cmp.mapping.complete(),
+ ["<C-e>"] = cmp.mapping.close(),
+ ["<CR>"] = cmp.mapping.confirm({
+ behavior = cmp.ConfirmBehavior.Insert,
+ select = true, -- Automatically select first item on CR
+ }),
+ },
+ })
+ end,
+ dependencies = {
+ { "L3MON4D3/LuaSnip" },
+ { "hrsh7th/cmp-emoji" },
+ { "hrsh7th/cmp-nvim-lsp" },
+ { "hrsh7th/cmp-nvim-lsp-signature-help" },
+ { "hrsh7th/cmp-nvim-lua" },
+ { "hrsh7th/cmp-path" },
+ { "onsails/lspkind.nvim" },
+ { "saadparwaiz1/cmp_luasnip" },
+ { "someone-stole-my-name/cmp-ledger" },
{
- -- Not sure how stable is this, but it works for now. The first element
- -- always points to $HOME/.config/nvim
- dir = vim.api.nvim_list_runtime_paths()[1] .. "/lua/plugins/dev/cmp-abook",
+ -- Not sure how stable is this, but it works for now. The first element
+ -- always points to $HOME/.config/nvim
+ dir = vim.api.nvim_list_runtime_paths()[1]
+ .. "/lua/plugins/dev/cmp-abook",
},
+ },
}
diff --git a/lua/plugins/lsp/config.lua b/lua/plugins/lsp/config.lua
index 579cfec..38aec3d 100644
--- a/lua/plugins/lsp/config.lua
+++ b/lua/plugins/lsp/config.lua
@@ -1,45 +1,49 @@
return {
- {
- "neovim/nvim-lspconfig",
- event = { "BufReadPre", "BufNewFile" },
- opts = { servers = {} },
- config = function(_, opts)
- local add_hook_after = require("lspconfig.util").add_hook_after
- local on_attach = function(client, bufnr)
- require("nvim-navic").attach(client, bufnr)
- end
+ {
+ "neovim/nvim-lspconfig",
+ event = { "BufReadPre", "BufNewFile" },
+ opts = { servers = {} },
+ config = function(_, opts)
+ local add_hook_after = require("lspconfig.util").add_hook_after
+ local on_attach = function(client, bufnr)
+ require("nvim-navic").attach(client, bufnr)
+ end
- for lsp, lsp_opts in pairs(opts.servers) do
- lsp_opts = lsp_opts or {}
- if lsp_opts.on_attach ~= nil then
- lsp_opts["on_attach"] = add_hook_after(on_attach, lsp_opts.on_attach)
- end
- lsp_opts["capabilities"] = require("cmp_nvim_lsp").default_capabilities(
- lsp_opts.capabilities or {}
- )
- require("lspconfig")[lsp].setup(lsp_opts)
- end
- end,
- init = function()
- vim.diagnostic.config({
- float = {
- source = "always",
- format = function(diagnostic)
- -- should work for any LSP, see: https://github.com/neovim/neovim/pull/17510
- if diagnostic.code then
- return string.format(
- "(%s) %s",
- diagnostic.code,
- diagnostic.message
- )
- end
- return diagnostic.message
- end,
- },
- })
- end,
- dependencies = {
- { "SmiteshP/nvim-navic", opts = { highlight = true } },
- },
- },
+ for lsp, lsp_opts in pairs(opts.servers) do
+ lsp_opts = lsp_opts or {}
+ if lsp_opts.on_attach ~= nil then
+ lsp_opts["on_attach"] =
+ add_hook_after(on_attach, lsp_opts.on_attach)
+ end
+ lsp_opts["capabilities"] =
+ require("cmp_nvim_lsp").default_capabilities(
+ lsp_opts.capabilities or {}
+ )
+ lsp_opts.capabilities.textDocument.completion.completionItem.snippetSupport =
+ true
+ require("lspconfig")[lsp].setup(lsp_opts)
+ end
+ end,
+ init = function()
+ vim.diagnostic.config({
+ float = {
+ source = "always",
+ format = function(diagnostic)
+ -- should work for any LSP, see: https://github.com/neovim/neovim/pull/17510
+ if diagnostic.code then
+ return string.format(
+ "(%s) %s",
+ diagnostic.code,
+ diagnostic.message
+ )
+ end
+ return diagnostic.message
+ end,
+ },
+ })
+ end,
+ dependencies = {
+ { "SmiteshP/nvim-navic", opts = { highlight = true } },
+ },
+ },
}
diff --git a/lua/plugins/lsp/null-ls.lua b/lua/plugins/lsp/null-ls.lua
index 5f71af7..f530586 100644
--- a/lua/plugins/lsp/null-ls.lua
+++ b/lua/plugins/lsp/null-ls.lua
@@ -1,5 +1,5 @@
return {
- "jose-elias-alvarez/null-ls.nvim",
- opts = { sources = {}, debug = false },
- dependencies = { "nvim-lua/plenary.nvim" },
+ "jose-elias-alvarez/null-ls.nvim",
+ opts = { sources = {}, debug = false },
+ dependencies = { "nvim-lua/plenary.nvim" },
}
diff --git a/lua/plugins/lsp/trouble.lua b/lua/plugins/lsp/trouble.lua
index 207edb5..e63ae22 100644
--- a/lua/plugins/lsp/trouble.lua
+++ b/lua/plugins/lsp/trouble.lua
@@ -1,9 +1,9 @@
return {
- {
- "folke/trouble.nvim",
- dependencies = { "nvim-tree/nvim-web-devicons" },
- config = function()
- require("trouble").setup({})
- end,
- },
+ {
+ "folke/trouble.nvim",
+ dependencies = { "nvim-tree/nvim-web-devicons" },
+ config = function()
+ require("trouble").setup({})
+ end,
+ },
}