feat(nvim): upgrade config to latest commit again
This commit is contained in:
parent
0f4f97830d
commit
790af516b3
@ -183,7 +183,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 56b9114bf29cdc0c0f5de78b5deae1fe0ab65db1 \
|
||||
&& git reset --hard 84cc12354dbe0ebda180d445f54820def8c4638f \
|
||||
&& 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 0d380e8..ae61b90 100644
|
||||
index ee1d3b4..3bab31f 100644
|
||||
--- a/init.lua
|
||||
+++ b/init.lua
|
||||
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
||||
@ -24,7 +24,7 @@ index 0d380e8..ae61b90 100644
|
||||
|
||||
-- Don't show the mode, since it's already in the status line
|
||||
vim.opt.showmode = false
|
||||
@@ -154,6 +154,14 @@ vim.opt.cursorline = true
|
||||
@@ -157,6 +157,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 0d380e8..ae61b90 100644
|
||||
-- [[ Basic Keymaps ]]
|
||||
-- See `:help vim.keymap.set()`
|
||||
|
||||
@@ -575,6 +583,28 @@ require('lazy').setup({
|
||||
@@ -579,6 +587,28 @@ require('lazy').setup({
|
||||
-- tsserver = {},
|
||||
--
|
||||
|
||||
@ -68,7 +68,7 @@ index 0d380e8..ae61b90 100644
|
||||
lua_ls = {
|
||||
-- cmd = {...},
|
||||
-- filetypes = { ...},
|
||||
@@ -589,6 +619,33 @@ require('lazy').setup({
|
||||
@@ -593,6 +623,33 @@ require('lazy').setup({
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -102,7 +102,7 @@ index 0d380e8..ae61b90 100644
|
||||
}
|
||||
|
||||
-- Ensure the servers and tools above are installed
|
||||
@@ -615,6 +672,33 @@ require('lazy').setup({
|
||||
@@ -619,6 +676,33 @@ require('lazy').setup({
|
||||
-- by the server configuration above. Useful when disabling
|
||||
-- certain features of an LSP (for example, turning off formatting for tsserver)
|
||||
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||
@ -136,7 +136,7 @@ index 0d380e8..ae61b90 100644
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
@@ -838,7 +922,39 @@ require('lazy').setup({
|
||||
@@ -841,7 +925,39 @@ require('lazy').setup({
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
opts = {
|
||||
@ -177,7 +177,7 @@ index 0d380e8..ae61b90 100644
|
||||
-- Autoinstall languages that are not installed
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
@@ -877,18 +993,18 @@ require('lazy').setup({
|
||||
@@ -880,18 +996,18 @@ 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