From 3f0d2cece1f6565d4a838ae6638a1bab6a32ae3f Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Fri, 29 Mar 2024 20:32:55 +0000 Subject: [PATCH] feat(nvim): upgrade kickstart.nvim to latest commit (#32) Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/32 Co-authored-by: Joao P Dubas Co-committed-by: Joao P Dubas --- Dockerfile | 2 +- patch/kickstart.nvim/updates.patch | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99fd7b7..3aac43d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -169,7 +169,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 773e482d4b40cec4095e4b60fbd753cb69b3f51b \ + && git reset --hard 93fde0556e82ead2a5392ccb678359fa59437b98 \ && 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 2bbff1f..285a8e7 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 013fcc2..ca98546 100644 +index db55a9e..1a11f8a 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -18,9 +18,8 @@ index 013fcc2..ca98546 100644 --- vim.opt.relativenumber = true +vim.opt.relativenumber = true ---- Enable mouse mode, can be useful for resizing splits for example! + -- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = 'a' -+-- Disable mouse mode +vim.opt.mouse = '' -- Don't show the mode, since it's already in the status line @@ -112,12 +111,14 @@ index 013fcc2..ca98546 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -791,7 +843,31 @@ require('lazy').setup({ +@@ -791,7 +843,34 @@ require('lazy').setup({ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', opts = { -- ensure_installed = { 'bash', 'c', 'html', 'lua', 'markdown', 'vim', 'vimdoc' }, +- ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, + ensure_installed = { ++ 'bash', ++ 'c', + 'css', + 'dockerfile', + 'eex', @@ -131,6 +132,7 @@ index 013fcc2..ca98546 100644 + 'javascript', + 'json', + 'lua', ++ 'luadoc', + 'markdown', + 'markdown_inline', + 'python', @@ -145,7 +147,7 @@ index 013fcc2..ca98546 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -828,7 +904,7 @@ require('lazy').setup({ +@@ -828,7 +907,7 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', @@ -154,7 +156,7 @@ index 013fcc2..ca98546 100644 -- require 'kickstart.plugins.lint', -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -@@ -836,7 +912,7 @@ require('lazy').setup({ +@@ -836,7 +915,7 @@ require('lazy').setup({ -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`