From b82ebabcf7d9749906a31c9b93e087a8c456c8a0 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Mon, 16 Sep 2024 18:01:42 -0300 Subject: [PATCH] chore(nvim): upgrade kickstart to latest commit --- Dockerfile | 2 +- patch/kickstart.nvim/updates.patch | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index e191791..18da2f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -183,7 +183,7 @@ COPY ./patch/kickstart.nvim/updates.patch /tmp COPY ./config/nvim/lua/custom/plugins/init.lua /tmp RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \ && cd ${XDG_CONFIG_HOME}/nvim \ - && git reset --hard 186018483039b20dc39d7991e4fb28090dd4750e \ + && git reset --hard 7201dc480134f41dd1be1f8f9b8f8470aac82a3b \ && git apply /tmp/updates.patch \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && nvim --headless "+Lazy! sync" +qa diff --git a/patch/kickstart.nvim/updates.patch b/patch/kickstart.nvim/updates.patch index 1407005..1442cfd 100644 --- a/patch/kickstart.nvim/updates.patch +++ b/patch/kickstart.nvim/updates.patch @@ -1,5 +1,5 @@ diff --git a/init.lua b/init.lua -index 220d304..4fd8e38 100644 +index ea86b79..93250ab 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -39,8 +39,8 @@ index 220d304..4fd8e38 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -582,6 +590,28 @@ require('lazy').setup({ - -- tsserver = {}, +@@ -618,6 +626,28 @@ require('lazy').setup({ + -- ts_ls = {}, -- + cuelsp = {}, @@ -68,7 +68,7 @@ index 220d304..4fd8e38 100644 lua_ls = { -- cmd = {...}, -- filetypes = { ...}, -@@ -596,6 +626,33 @@ require('lazy').setup({ +@@ -632,6 +662,33 @@ require('lazy').setup({ }, }, }, @@ -102,9 +102,9 @@ index 220d304..4fd8e38 100644 } -- Ensure the servers and tools above are installed -@@ -622,6 +679,33 @@ require('lazy').setup({ +@@ -658,6 +715,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for tsserver) + -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + -- overwrite elixirls for older versions of elixir + -- * elixir 1.11 use version 0.12.0 @@ -136,9 +136,9 @@ index 220d304..4fd8e38 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -844,7 +928,39 @@ require('lazy').setup({ - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', +@@ -888,7 +972,39 @@ require('lazy').setup({ + main = 'nvim-treesitter.configs', -- Sets main module to use for opts + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { @@ -177,7 +177,7 @@ index 220d304..4fd8e38 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -881,18 +997,18 @@ require('lazy').setup({ +@@ -918,18 +1034,18 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug',