diff --git a/Dockerfile b/Dockerfile index 7766cf1..f20ddc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -137,7 +137,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 313bd75ca04cb2cef48a79ac3ad697a1b9a2daab \ + && git reset --hard 9b256d93688b3d295dab89f06faeff741af58a68 \ && 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 3ab6f8e..0ff7dc7 100644 --- a/patch/kickstart.nvim/updates.patch +++ b/patch/kickstart.nvim/updates.patch @@ -1,8 +1,8 @@ diff --git a/init.lua b/init.lua -index 5257113..85e97a5 100644 +index a7667dd..6bf8654 100644 --- a/init.lua +++ b/init.lua -@@ -219,7 +219,7 @@ require('lazy').setup({ +@@ -227,7 +227,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins @@ -11,7 +11,7 @@ index 5257113..85e97a5 100644 }, {}) -- [[ Setting options ]] -@@ -229,11 +229,12 @@ require('lazy').setup({ +@@ -237,11 +237,12 @@ require('lazy').setup({ -- Set highlight on search vim.o.hlsearch = false @@ -27,7 +27,7 @@ index 5257113..85e97a5 100644 -- Sync clipboard between OS and Neovim. -- Remove this option if you want your OS clipboard to remain independent. -@@ -263,6 +264,14 @@ vim.o.completeopt = 'menuone,noselect' +@@ -271,6 +272,14 @@ vim.o.completeopt = 'menuone,noselect' -- NOTE: You should make sure your terminal supports this vim.o.termguicolors = true @@ -42,40 +42,40 @@ index 5257113..85e97a5 100644 -- [[ Basic Keymaps ]] -- Keymaps for better default experience -@@ -323,11 +332,29 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = - -- See `:help nvim-treesitter` - require('nvim-treesitter.configs').setup { - -- Add languages to be installed here that you want installed for treesitter -- ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim' }, +@@ -333,11 +342,29 @@ 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 +- ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' }, - -+ ensure_installed = { -+ 'css', -+ 'dockerfile', -+ 'eex', -+ 'elixir', -+ 'erlang', -+ 'go', -+ 'heex', -+ 'html', -+ 'http', -+ 'javascript', -+ 'json', -+ 'lua', -+ 'markdown', -+ 'python', -+ 'sql', -+ 'tsx', -+ 'typescript', -+ 'vim', -+ 'vimdoc' -+ }, - -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) - auto_install = false, ++ ensure_installed = { ++ 'css', ++ 'dockerfile', ++ 'eex', ++ 'elixir', ++ 'erlang', ++ 'go', ++ 'heex', ++ 'html', ++ 'http', ++ 'javascript', ++ 'json', ++ 'lua', ++ 'markdown', ++ 'python', ++ 'sql', ++ 'tsx', ++ 'typescript', ++ 'vim', ++ 'vimdoc' ++ }, + -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) + auto_install = false, - - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { -@@ -456,19 +483,24 @@ require('which-key').register({ + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { +@@ -472,19 +499,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 = {