joao.dubas/ide
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

feat: upgrade kickstart nvim config

Browse Source
This commit is contained in:
João Paulo Dubas 2024-07-22 18:23:46 +00:00
parent 8aaf781f67
commit 1293704600
Signed by: joao.dubas
SSH Key Fingerprint: SHA256:V1mixgOGRc/YMhGx/DNkOSmJxgA2vHNrDZEk3wt/kOA
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -183,7 +183,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 5aeddfdd5d0308506ec63b0e4f8de33e2a39355f \ && git reset --hard 2df5137e59c28fc9148148db8ed4a9f7abf73b4f \
&& 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

15
patch/kickstart.nvim/updates.patch
View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index 88658ef..b2e4e40 100644 index 624e23d..cfc184e 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 = ' '
@ -39,7 +39,7 @@ index 88658ef..b2e4e40 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()` -- See `:help vim.keymap.set()`
@@ -578,6 +586,28 @@ require('lazy').setup({ @@ -577,6 +585,28 @@ require('lazy').setup({
-- tsserver = {}, -- tsserver = {},
-- --
@ -68,7 +68,7 @@ index 88658ef..b2e4e40 100644
lua_ls = { lua_ls = {
-- cmd = {...}, -- cmd = {...},
-- filetypes = { ...}, -- filetypes = { ...},
@@ -592,6 +622,33 @@ require('lazy').setup({ @@ -591,6 +621,33 @@ require('lazy').setup({
}, },
}, },
}, },
@ -102,7 +102,7 @@ index 88658ef..b2e4e40 100644
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
@@ -618,6 +675,33 @@ require('lazy').setup({ @@ -617,6 +674,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 {})
@ -136,11 +136,11 @@ index 88658ef..b2e4e40 100644
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end,
}, },
@@ -835,7 +919,38 @@ require('lazy').setup({ @@ -834,7 +918,39 @@ require('lazy').setup({
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate', build = ':TSUpdate',
opts = { opts = {
- ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
+ ensure_installed = { + ensure_installed = {
+ 'bash', + 'bash',
+ 'c', + 'c',
@ -163,6 +163,7 @@ index 88658ef..b2e4e40 100644
+ 'markdown', + 'markdown',
+ 'markdown_inline', + 'markdown_inline',
+ 'python', + 'python',
+ 'query',
+ 'sql', + 'sql',
+ 'templ', + 'templ',
+ 'terraform', + 'terraform',
@ -176,7 +177,7 @@ index 88658ef..b2e4e40 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -874,18 +989,18 @@ require('lazy').setup({ @@ -873,18 +989,18 @@ 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',