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

feat(neovim): upgrade kickstart to latest commit

Browse Source
This commit is contained in:
João Paulo Dubas 2024-11-26 18:27:49 -03:00
parent 7bcaf0e388
commit 86ab55d622
No known key found for this signature in database
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -184,7 +184,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 4120893b8a1f31a0957f2f891f7fbef73ddfb9b1 \ && git reset --hard 8d1ef972bc32faa86fee21a57f9033b41f612ebb \
&& 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

19
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 ea86b79..7323a7f 100644 index 08717d5..96c1e03 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 ea86b79..7323a7f 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()` -- See `:help vim.keymap.set()`
@@ -618,6 +626,27 @@ require('lazy').setup({ @@ -628,6 +636,27 @@ require('lazy').setup({
-- ts_ls = {}, -- ts_ls = {},
-- --
@ -67,7 +67,7 @@ index ea86b79..7323a7f 100644
lua_ls = { lua_ls = {
-- cmd = {...}, -- cmd = {...},
-- filetypes = { ...}, -- filetypes = { ...},
@@ -632,6 +661,32 @@ require('lazy').setup({ @@ -642,6 +671,32 @@ require('lazy').setup({
}, },
}, },
}, },
@ -100,7 +100,7 @@ index ea86b79..7323a7f 100644
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
@@ -658,6 +713,33 @@ require('lazy').setup({ @@ -668,6 +723,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 ts_ls) -- certain features of an LSP (for example, turning off formatting for ts_ls)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
@ -134,7 +134,7 @@ index ea86b79..7323a7f 100644
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end,
}, },
@@ -888,7 +970,39 @@ require('lazy').setup({ @@ -898,7 +980,39 @@ require('lazy').setup({
main = 'nvim-treesitter.configs', -- Sets main module to use for opts main = 'nvim-treesitter.configs', -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter` -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = { opts = {
@ -175,7 +175,7 @@ index ea86b79..7323a7f 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -918,18 +1032,18 @@ require('lazy').setup({ @@ -928,17 +1042,17 @@ 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',
@ -191,9 +191,8 @@ index ea86b79..7323a7f 100644
-- This is the easiest way to modularize your config. -- This is the easiest way to modularize your config.
-- --
-- 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`
- -- { import = 'custom.plugins' }, - -- { import = 'custom.plugins' },
+ { import = 'custom.plugins' }, + { import = 'custom.plugins' },
}, { --
ui = { -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
-- If you are using a Nerd Font: set icons to an empty table which will use the -- Or use telescope!