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

chore(nvim): upgrade kickstart to latest commit

Browse Source
This commit is contained in:
Joao P Dubas 2024-01-14 18:49:18 +00:00
parent 1afba6dbb8
commit 02db07e29f
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -130,7 +130,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 4d0dc8d4b1bd6b94e59f7773158149bb1b0ee5be \ && git reset --hard 2510c29d62d39d63bb75f1a613d2ae628a2af4ee \
&& 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

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

@ -1,7 +1,5 @@
:100644 100644 7e68de6 0000000 M init.lua
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index 7e68de6..f886b8a 100644 index 1ff16af..2ef9591 100644
--- a/init.lua --- a/init.lua
+++ b/init.lua +++ b/init.lua
@@ -266,7 +266,7 @@ require('lazy').setup({ @@ -266,7 +266,7 @@ require('lazy').setup({
@ -44,7 +42,7 @@ index 7e68de6..f886b8a 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- Keymaps for better default experience -- Keymaps for better default experience
@@ -423,11 +432,33 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = @@ -423,8 +432,31 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
vim.defer_fn(function() vim.defer_fn(function()
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
-- Add languages to be installed here that you want installed for treesitter -- Add languages to be installed here that you want installed for treesitter
@ -77,11 +75,8 @@ index 7e68de6..f886b8a 100644
+ }, + },
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
auto_install = false, auto_install = false,
- -- Install languages synchronously (only applied to `ensure_installed`)
highlight = { enable = true }, @@ -568,13 +600,16 @@ require('mason-lspconfig').setup()
indent = { enable = true },
incremental_selection = {
@@ -563,13 +594,16 @@ require('mason-lspconfig').setup()
-- If you want to override the default filetypes that your language server will attach to you can -- If you want to override the default filetypes that your language server will attach to you can
-- define the property 'filetypes' to the map in question. -- define the property 'filetypes' to the map in question.
local servers = { local servers = {
@ -105,7 +100,7 @@ index 7e68de6..f886b8a 100644
lua_ls = { lua_ls = {
Lua = { Lua = {
workspace = { checkThirdParty = false }, workspace = { checkThirdParty = false },
@@ -578,6 +612,8 @@ local servers = { @@ -583,6 +618,8 @@ local servers = {
-- diagnostics = { disable = { 'missing-fields' } }, -- diagnostics = { disable = { 'missing-fields' } },
}, },
}, },
@ -114,7 +109,7 @@ index 7e68de6..f886b8a 100644
} }
-- Setup neovim lua configuration -- Setup neovim lua configuration
@@ -596,12 +632,23 @@ mason_lspconfig.setup { @@ -601,12 +638,23 @@ mason_lspconfig.setup {
mason_lspconfig.setup_handlers { mason_lspconfig.setup_handlers {
function(server_name) function(server_name)