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

feat(nvim): upgrade kickstart.nvim to latest commit (#32)

Browse Source 
Reviewed-on: #32
Co-authored-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
Co-committed-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
This commit is contained in:
João Paulo Dubas 2024-03-29 20:32:55 +00:00 committed by João Paulo Dubas
parent d9a33dc515
commit 3f0d2cece1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -169,7 +169,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 773e482d4b40cec4095e4b60fbd753cb69b3f51b \ && git reset --hard 93fde0556e82ead2a5392ccb678359fa59437b98 \
&& 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

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

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index 013fcc2..ca98546 100644 index db55a9e..1a11f8a 100644
--- a/init.lua --- a/init.lua
+++ b/init.lua +++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -91,7 +91,7 @@ vim.g.mapleader = ' '
@ -18,9 +18,8 @@ index 013fcc2..ca98546 100644
--- vim.opt.relativenumber = true --- vim.opt.relativenumber = true
+vim.opt.relativenumber = true +vim.opt.relativenumber = true
--- Enable mouse mode, can be useful for resizing splits for example! -- Enable mouse mode, can be useful for resizing splits for example!
-vim.opt.mouse = 'a' -vim.opt.mouse = 'a'
+-- Disable mouse mode
+vim.opt.mouse = '' +vim.opt.mouse = ''
-- Don't show the mode, since it's already in the status line -- Don't show the mode, since it's already in the status line
@ -112,12 +111,14 @@ index 013fcc2..ca98546 100644
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end,
}, },
@@ -791,7 +843,31 @@ require('lazy').setup({ @@ -791,7 +843,34 @@ require('lazy').setup({
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate', build = ':TSUpdate',
opts = { opts = {
- ensure_installed = { 'bash', 'c', 'html', 'lua', 'markdown', 'vim', 'vimdoc' }, - ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
+ ensure_installed = { + ensure_installed = {
+ 'bash',
+ 'c',
+ 'css', + 'css',
+ 'dockerfile', + 'dockerfile',
+ 'eex', + 'eex',
@ -131,6 +132,7 @@ index 013fcc2..ca98546 100644
+ 'javascript', + 'javascript',
+ 'json', + 'json',
+ 'lua', + 'lua',
+ 'luadoc',
+ 'markdown', + 'markdown',
+ 'markdown_inline', + 'markdown_inline',
+ 'python', + 'python',
@ -145,7 +147,7 @@ index 013fcc2..ca98546 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -828,7 +904,7 @@ require('lazy').setup({ @@ -828,7 +907,7 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim). -- Uncomment any of the lines below to enable them (you will need to restart nvim).
-- --
-- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.debug',
@ -154,7 +156,7 @@ index 013fcc2..ca98546 100644
-- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.lint',
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
@@ -836,7 +912,7 @@ require('lazy').setup({ @@ -836,7 +915,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 `:help lazy.nvim-lazy.nvim-structuring-your-plugins` -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`