feat(nvim): upgrade kickstart to latest commit

This commit is contained in:
João Paulo Dubas 2024-03-19 16:12:41 +00:00
parent 74cc47517c
commit 88d52075b0
Signed by: joao.dubas
SSH Key Fingerprint: SHA256:V1mixgOGRc/YMhGx/DNkOSmJxgA2vHNrDZEk3wt/kOA
2 changed files with 13 additions and 12 deletions

View File

@ -169,7 +169,7 @@ COPY ./patch/kickstart.nvim/updates.patch /tmp
COPY ./config/nvim/lua/custom/plugins/init.lua /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 \ RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \
&& cd ${XDG_CONFIG_HOME}/nvim \ && cd ${XDG_CONFIG_HOME}/nvim \
&& git reset --hard ea4335f5af2fabbf063f8bf946f05583f215f904 \ && git reset --hard 773e482d4b40cec4095e4b60fbd753cb69b3f51b \
&& git apply /tmp/updates.patch \ && git apply /tmp/updates.patch \
&& cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
&& nvim --headless "+Lazy! sync" +qa && nvim --headless "+Lazy! sync" +qa

View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index 506bbaf..33db6a3 100644 index 013fcc2..ca98546 100644
--- a/init.lua --- a/init.lua
+++ b/init.lua +++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -91,7 +91,7 @@ vim.g.mapleader = ' '
@ -13,7 +13,7 @@ index 506bbaf..33db6a3 100644
-- See `:help vim.opt` -- See `:help vim.opt`
@@ -102,10 +102,10 @@ vim.g.have_nerd_font = false @@ -102,10 +102,10 @@ vim.g.have_nerd_font = false
vim.opt.number = true vim.opt.number = true
-- You can also add relative line numbers, for help with jumping. -- You can also add relative line numbers, to help with jumping.
-- Experiment for yourself to see if you like it! -- Experiment for yourself to see if you like it!
--- vim.opt.relativenumber = true --- vim.opt.relativenumber = true
+vim.opt.relativenumber = true +vim.opt.relativenumber = true
@ -23,7 +23,7 @@ index 506bbaf..33db6a3 100644
+-- Disable mouse mode +-- Disable mouse mode
+vim.opt.mouse = '' +vim.opt.mouse = ''
-- Don't show the mode, since it's already in status line -- Don't show the mode, since it's already in the status line
vim.opt.showmode = false vim.opt.showmode = false
@@ -154,6 +154,14 @@ vim.opt.cursorline = true @@ -154,6 +154,14 @@ vim.opt.cursorline = true
-- Minimal number of screen lines to keep above and below the cursor. -- Minimal number of screen lines to keep above and below the cursor.
@ -48,7 +48,7 @@ index 506bbaf..33db6a3 100644
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' }, ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' }, ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
@@ -552,6 +561,18 @@ require('lazy').setup({ @@ -551,6 +560,18 @@ require('lazy').setup({
-- tsserver = {}, -- tsserver = {},
-- --
@ -66,8 +66,8 @@ index 506bbaf..33db6a3 100644
+ htmx = {}, + htmx = {},
lua_ls = { lua_ls = {
-- cmd = {...}, -- cmd = {...},
-- filetypes { ...}, -- filetypes = { ...},
@@ -566,6 +587,10 @@ require('lazy').setup({ @@ -565,6 +586,10 @@ require('lazy').setup({
}, },
}, },
}, },
@ -78,7 +78,7 @@ index 506bbaf..33db6a3 100644
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
@@ -592,6 +617,33 @@ require('lazy').setup({ @@ -591,6 +616,33 @@ require('lazy').setup({
-- by the server configuration above. Useful when disabling -- 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 tsserver)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
@ -112,7 +112,7 @@ index 506bbaf..33db6a3 100644
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end,
}, },
@@ -793,7 +845,31 @@ require('lazy').setup({ @@ -791,7 +843,31 @@ require('lazy').setup({
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate', build = ':TSUpdate',
opts = { opts = {
@ -145,15 +145,16 @@ index 506bbaf..33db6a3 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -830,14 +906,14 @@ require('lazy').setup({ @@ -828,7 +904,7 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim). -- Uncomment any of the lines below to enable them (you will need to restart nvim).
-- --
-- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.debug',
- -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.indent_line',
+ require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint',
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-- This is the easiest way to modularize your config. @@ -836,7 +912,7 @@ require('lazy').setup({
-- --
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- 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` -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
@ -161,4 +162,4 @@ index 506bbaf..33db6a3 100644
+ { import = 'custom.plugins' }, + { import = 'custom.plugins' },
}, { }, {
ui = { ui = {
-- If you have a Nerd Font, set icons to an empty table which will use the -- If you are using a Nerd Font: set icons to an empty table which will use the