From 9f8b1fbe85792b36c5ce05d7d21201364aea430f Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Fri, 24 Nov 2023 12:45:53 +0000 Subject: [PATCH] chore: upgrade kickstart to latest version Also add some treesitter parsers: 1. gitcommit 2. markdown_inline 3. toml 4. yaml --- Dockerfile | 2 +- patch/kickstart.nvim/updates.patch | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2acd84..3be712b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -144,7 +144,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 a005f15cec8072c97201f86e15df62c7e4a4490e \ + && git reset --hard 1915cea32e13fcb4191904de8f5e0252ad050a6e \ && 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 06ee2a9..2831eda 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 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa24ebc240 100644 +index 3a98da0..e8e41b4 100644 --- a/init.lua +++ b/init.lua @@ -229,7 +229,7 @@ require('lazy').setup({ @@ -42,7 +42,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa -- [[ Basic Keymaps ]] -- Keymaps for better default experience -@@ -378,11 +387,29 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = +@@ -378,11 +387,33 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = vim.defer_fn(function() require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter @@ -54,6 +54,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa + 'eex', + 'elixir', + 'erlang', ++ 'gitcommit', + 'go', + 'heex', + 'html', @@ -62,12 +63,15 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa + 'json', + 'lua', + 'markdown', ++ 'markdown_inline', + 'python', + 'sql', ++ 'toml', + 'tsx', + 'typescript', + 'vim', -+ 'vimdoc' ++ 'vimdoc', ++ 'yaml' + }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, @@ -75,7 +79,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa highlight = { enable = true }, indent = { enable = true }, incremental_selection = { -@@ -511,19 +538,24 @@ require('mason-lspconfig').setup() +@@ -511,19 +542,24 @@ require('mason-lspconfig').setup() -- 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. local servers = { @@ -107,7 +111,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa } -- Setup neovim lua configuration -@@ -542,12 +574,20 @@ mason_lspconfig.setup { +@@ -542,12 +578,20 @@ mason_lspconfig.setup { mason_lspconfig.setup_handlers { function(server_name)