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

feat(nvim): upgrade kickstart to latest commit

Browse Source
This commit is contained in:
Joao P Dubas 2023-11-10 15:04:54 +00:00
parent 770d8c9005
commit f9325ab469
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -144,7 +144,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 9b256d93688b3d295dab89f06faeff741af58a68 \ && git reset --hard a005f15cec8072c97201f86e15df62c7e4a4490e \
&& 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

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

@ -1,8 +1,8 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index a7667dd..6bf8654 100644 index 748e7f8..47e327a 100644
--- a/init.lua --- a/init.lua
+++ b/init.lua +++ b/init.lua
@@ -227,7 +227,7 @@ require('lazy').setup({ @@ -229,7 +229,7 @@ require('lazy').setup({
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- 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 -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
@ -11,7 +11,7 @@ index a7667dd..6bf8654 100644
}, {}) }, {})
-- [[ Setting options ]] -- [[ Setting options ]]
@@ -237,11 +237,12 @@ require('lazy').setup({ @@ -239,11 +239,12 @@ require('lazy').setup({
-- Set highlight on search -- Set highlight on search
vim.o.hlsearch = false vim.o.hlsearch = false
@ -27,7 +27,7 @@ index a7667dd..6bf8654 100644
-- Sync clipboard between OS and Neovim. -- Sync clipboard between OS and Neovim.
-- Remove this option if you want your OS clipboard to remain independent. -- Remove this option if you want your OS clipboard to remain independent.
@@ -271,6 +272,14 @@ vim.o.completeopt = 'menuone,noselect' @@ -273,6 +274,14 @@ vim.o.completeopt = 'menuone,noselect'
-- NOTE: You should make sure your terminal supports this -- NOTE: You should make sure your terminal supports this
vim.o.termguicolors = true vim.o.termguicolors = true
@ -42,7 +42,7 @@ index a7667dd..6bf8654 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- Keymaps for better default experience -- Keymaps for better default experience
@@ -333,11 +342,29 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = @@ -378,11 +387,29 @@ 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
@ -75,7 +75,7 @@ index a7667dd..6bf8654 100644
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
incremental_selection = { incremental_selection = {
@@ -472,19 +499,24 @@ require('mason-lspconfig').setup() @@ -511,19 +538,24 @@ 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 = {