diff --git a/Dockerfile b/Dockerfile index 2d1bf70..d3c9665 100644 --- a/Dockerfile +++ b/Dockerfile @@ -184,7 +184,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 7201dc480134f41dd1be1f8f9b8f8470aac82a3b \ + && git reset --hard 4120893b8a1f31a0957f2f891f7fbef73ddfb9b1 \ && 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 1442cfd..bcaf05a 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 ea86b79..93250ab 100644 +index ea86b79..7323a7f 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -39,7 +39,7 @@ index ea86b79..93250ab 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -618,6 +626,28 @@ require('lazy').setup({ +@@ -618,6 +626,27 @@ require('lazy').setup({ -- ts_ls = {}, -- @@ -55,7 +55,6 @@ index ea86b79..93250ab 100644 + gopls = {}, + helm_ls = {}, + html = { filetypes = { 'html', 'twig', 'hbs' } }, -+ htmx = {}, + jsonls = { + settings = { + json = { @@ -68,12 +67,11 @@ index ea86b79..93250ab 100644 lua_ls = { -- cmd = {...}, -- filetypes = { ...}, -@@ -632,6 +662,33 @@ require('lazy').setup({ +@@ -632,6 +661,32 @@ require('lazy').setup({ }, }, }, + pyright = {}, -+ r_language_server = {}, + templ = {}, + terraformls = {}, + ts_ls = {}, @@ -102,7 +100,7 @@ index ea86b79..93250ab 100644 } -- Ensure the servers and tools above are installed -@@ -658,6 +715,33 @@ require('lazy').setup({ +@@ -658,6 +713,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -136,7 +134,7 @@ index ea86b79..93250ab 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -888,7 +972,39 @@ require('lazy').setup({ +@@ -888,7 +970,39 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { @@ -177,7 +175,7 @@ index ea86b79..93250ab 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -918,18 +1034,18 @@ require('lazy').setup({ +@@ -918,18 +1032,18 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug',