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

chore(nvim): update git to latest commit

Browse Source 
Also, remove unused lsp servers:

* htmx
* r-language-server
This commit is contained in:
João Paulo Dubas 2024-10-09 11:37:57 +00:00
parent af3857f5bb
commit 16da5c648c
Signed by: joao.dubas
SSH Key Fingerprint: SHA256:V1mixgOGRc/YMhGx/DNkOSmJxgA2vHNrDZEk3wt/kOA
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -184,7 +184,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 7201dc480134f41dd1be1f8f9b8f8470aac82a3b \ && git reset --hard 4120893b8a1f31a0957f2f891f7fbef73ddfb9b1 \
&& 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

14
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 ea86b79..93250ab 100644 index ea86b79..7323a7f 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 = ' '
@ -39,7 +39,7 @@ index ea86b79..93250ab 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()` -- See `:help vim.keymap.set()`
@@ -618,6 +626,28 @@ require('lazy').setup({ @@ -618,6 +626,27 @@ require('lazy').setup({
-- ts_ls = {}, -- ts_ls = {},
-- --
@ -55,7 +55,6 @@ index ea86b79..93250ab 100644
+ gopls = {}, + gopls = {},
+ helm_ls = {}, + helm_ls = {},
+ html = { filetypes = { 'html', 'twig', 'hbs' } }, + html = { filetypes = { 'html', 'twig', 'hbs' } },
+ htmx = {},
+ jsonls = { + jsonls = {
+ settings = { + settings = {
+ json = { + json = {
@ -68,12 +67,11 @@ index ea86b79..93250ab 100644
lua_ls = { lua_ls = {
-- cmd = {...}, -- cmd = {...},
-- filetypes = { ...}, -- filetypes = { ...},
@@ -632,6 +662,33 @@ require('lazy').setup({ @@ -632,6 +661,32 @@ require('lazy').setup({
}, },
}, },
}, },
+ pyright = {}, + pyright = {},
+ r_language_server = {},
+ templ = {}, + templ = {},
+ terraformls = {}, + terraformls = {},
+ ts_ls = {}, + ts_ls = {},
@ -102,7 +100,7 @@ index ea86b79..93250ab 100644
} }
-- Ensure the servers and tools above are installed -- 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 -- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for ts_ls) -- certain features of an LSP (for example, turning off formatting for ts_ls)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) 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) require('lspconfig')[server_name].setup(server)
end, 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 main = 'nvim-treesitter.configs', -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter` -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = { opts = {
@ -177,7 +175,7 @@ index ea86b79..93250ab 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { 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). -- Uncomment any of the lines below to enable them (you will need to restart nvim).
-- --
-- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.debug',