From fdfb8c55f4dd1be790652ad69bbe6efd812c85f5 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Fri, 16 Aug 2024 14:14:33 +0000 Subject: [PATCH] chore(nvim): upgrade kickstart to latest commit --- Dockerfile | 2 +- patch/kickstart.nvim/updates.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f0a49e..ad44e3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -183,7 +183,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 84cc12354dbe0ebda180d445f54820def8c4638f \ + && git reset --hard 186018483039b20dc39d7991e4fb28090dd4750e \ && 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 8b7ca27..0d5d776 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 ee1d3b4..3bab31f 100644 +index 220d304..62a9702 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -39,7 +39,7 @@ index ee1d3b4..3bab31f 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -579,6 +587,28 @@ require('lazy').setup({ +@@ -582,6 +590,28 @@ require('lazy').setup({ -- tsserver = {}, -- @@ -68,7 +68,7 @@ index ee1d3b4..3bab31f 100644 lua_ls = { -- cmd = {...}, -- filetypes = { ...}, -@@ -593,6 +623,33 @@ require('lazy').setup({ +@@ -596,6 +626,33 @@ require('lazy').setup({ }, }, }, @@ -102,7 +102,7 @@ index ee1d3b4..3bab31f 100644 } -- Ensure the servers and tools above are installed -@@ -619,6 +676,33 @@ require('lazy').setup({ +@@ -622,6 +679,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for tsserver) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -136,7 +136,7 @@ index ee1d3b4..3bab31f 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -841,7 +925,39 @@ require('lazy').setup({ +@@ -844,7 +928,39 @@ require('lazy').setup({ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', opts = { @@ -177,7 +177,7 @@ index ee1d3b4..3bab31f 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -880,18 +996,18 @@ require('lazy').setup({ +@@ -881,18 +997,18 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug',