feat(neovim): upgrade kickstart to latest commit (#159)
Reviewed-on: #159 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:
parent
77f714d83e
commit
bc8debfd23
@ -185,7 +185,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 8d1ef972bc32faa86fee21a57f9033b41f612ebb \
|
||||
&& git reset --hard 5bdde24dfb353d365d908c5dd700f412ed2ffb17 \
|
||||
&& git apply /tmp/updates.patch \
|
||||
&& cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
|
||||
&& nvim --headless "+Lazy! sync" +qa
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git a/init.lua b/init.lua
|
||||
index 08717d5..96c1e03 100644
|
||||
index 4eae8e7..ab4f5f6 100644
|
||||
--- a/init.lua
|
||||
+++ b/init.lua
|
||||
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
||||
@ -24,7 +24,7 @@ index 08717d5..96c1e03 100644
|
||||
|
||||
-- Don't show the mode, since it's already in the status line
|
||||
vim.opt.showmode = false
|
||||
@@ -157,6 +157,14 @@ vim.opt.cursorline = true
|
||||
@@ -156,6 +156,14 @@ vim.opt.cursorline = true
|
||||
-- Minimal number of screen lines to keep above and below the cursor.
|
||||
vim.opt.scrolloff = 10
|
||||
|
||||
@ -39,7 +39,7 @@ index 08717d5..96c1e03 100644
|
||||
-- [[ Basic Keymaps ]]
|
||||
-- See `:help vim.keymap.set()`
|
||||
|
||||
@@ -628,6 +636,27 @@ require('lazy').setup({
|
||||
@@ -629,6 +637,27 @@ require('lazy').setup({
|
||||
-- ts_ls = {},
|
||||
--
|
||||
|
||||
@ -65,9 +65,9 @@ index 08717d5..96c1e03 100644
|
||||
+ },
|
||||
+ },
|
||||
lua_ls = {
|
||||
-- cmd = {...},
|
||||
-- filetypes = { ...},
|
||||
@@ -642,6 +671,32 @@ require('lazy').setup({
|
||||
-- cmd = { ... },
|
||||
-- filetypes = { ... },
|
||||
@@ -643,6 +672,32 @@ require('lazy').setup({
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -100,7 +100,7 @@ index 08717d5..96c1e03 100644
|
||||
}
|
||||
|
||||
-- Ensure the servers and tools above are installed
|
||||
@@ -668,6 +723,33 @@ require('lazy').setup({
|
||||
@@ -672,6 +727,33 @@ require('lazy').setup({
|
||||
-- by the server configuration above. Useful when disabling
|
||||
-- certain features of an LSP (for example, turning off formatting for ts_ls)
|
||||
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||
@ -134,7 +134,7 @@ index 08717d5..96c1e03 100644
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
@@ -898,7 +980,39 @@ require('lazy').setup({
|
||||
@@ -902,7 +984,39 @@ require('lazy').setup({
|
||||
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
|
||||
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
||||
opts = {
|
||||
@ -175,7 +175,7 @@ index 08717d5..96c1e03 100644
|
||||
-- Autoinstall languages that are not installed
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
@@ -928,17 +1042,17 @@ require('lazy').setup({
|
||||
@@ -932,17 +1046,17 @@ require('lazy').setup({
|
||||
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
|
||||
--
|
||||
-- require 'kickstart.plugins.debug',
|
||||
|
Loading…
x
Reference in New Issue
Block a user