From e59351a3e75600a11c985a2fbfcd9db20e380e89 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 15 Feb 2025 23:27:11 +0000 Subject: [PATCH] feat(neovim): upgrade kickstart.nvim to latest commit (#182) Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/182 Co-authored-by: Joao P Dubas Co-committed-by: Joao P Dubas --- Dockerfile | 2 +- patch/kickstart.nvim/updates.patch | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ed2f69..e3672b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -185,7 +185,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 5bdde24dfb353d365d908c5dd700f412ed2ffb17 \ + && git reset --hard 94f551b8039a3f6399d2ea3373c4774005ede4db \ && 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 0613101..29e96b0 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 4eae8e7..b7be342 100644 +index 99c7c9c..4e49b43 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -39,7 +39,7 @@ index 4eae8e7..b7be342 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -629,6 +637,27 @@ require('lazy').setup({ +@@ -639,6 +647,27 @@ require('lazy').setup({ -- ts_ls = {}, -- @@ -67,7 +67,7 @@ index 4eae8e7..b7be342 100644 lua_ls = { -- cmd = { ... }, -- filetypes = { ... }, -@@ -643,6 +672,32 @@ require('lazy').setup({ +@@ -653,6 +682,32 @@ require('lazy').setup({ }, }, }, @@ -100,7 +100,7 @@ index 4eae8e7..b7be342 100644 } -- Ensure the servers and tools above are installed -@@ -672,6 +727,33 @@ require('lazy').setup({ +@@ -682,6 +737,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -134,7 +134,7 @@ index 4eae8e7..b7be342 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -830,6 +912,7 @@ require('lazy').setup({ +@@ -840,6 +922,7 @@ require('lazy').setup({ -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it group_index = 0, }, @@ -142,7 +142,7 @@ index 4eae8e7..b7be342 100644 { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, -@@ -844,12 +927,19 @@ require('lazy').setup({ +@@ -854,12 +937,19 @@ require('lazy').setup({ -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. 'folke/tokyonight.nvim', @@ -163,7 +163,7 @@ index 4eae8e7..b7be342 100644 -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' -@@ -902,7 +992,39 @@ require('lazy').setup({ +@@ -912,7 +1002,39 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { @@ -204,7 +204,7 @@ index 4eae8e7..b7be342 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -932,17 +1054,17 @@ require('lazy').setup({ +@@ -942,17 +1064,17 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug',