chore(neovim): update kickstart.nvim to latest commit (#202)
Reviewed-on: #202 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
106647b7b7
commit
9565b41b2a
@ -182,7 +182,7 @@ RUN fish -c true \
|
||||
&& echo 'alias nh="nvim --listen 0.0.0.0:6666 --headless &> /dev/null"' >> ${XDG_CONFIG_HOME}/fish/config.fish
|
||||
|
||||
# git configuration
|
||||
ENV NEOVIM_KICKSTART_VERSION 34e7d29aa7b6e95cf09d62baf4c9082db5b129c0
|
||||
ENV NEOVIM_KICKSTART_VERSION e947649cb0ee5ac3c75593288df04d4f58359106
|
||||
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 \
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git a/init.lua b/init.lua
|
||||
index 5cac3d1..813b1b4 100644
|
||||
index cbf9ff6..0205207 100644
|
||||
--- a/init.lua
|
||||
+++ b/init.lua
|
||||
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
||||
@ -24,9 +24,9 @@ index 5cac3d1..813b1b4 100644
|
||||
|
||||
-- Don't show the mode, since it's already in the status line
|
||||
vim.opt.showmode = false
|
||||
@@ -156,6 +156,14 @@ vim.opt.cursorline = true
|
||||
-- Minimal number of screen lines to keep above and below the cursor.
|
||||
vim.opt.scrolloff = 10
|
||||
@@ -161,6 +161,14 @@ vim.opt.scrolloff = 10
|
||||
-- See `:help 'confirm'`
|
||||
vim.opt.confirm = true
|
||||
|
||||
+-- Set foldmethod
|
||||
+-- See `:help foldmethod`
|
||||
@ -39,7 +39,7 @@ index 5cac3d1..813b1b4 100644
|
||||
-- [[ Basic Keymaps ]]
|
||||
-- See `:help vim.keymap.set()`
|
||||
|
||||
@@ -671,6 +679,27 @@ require('lazy').setup({
|
||||
@@ -682,6 +690,27 @@ require('lazy').setup({
|
||||
-- ts_ls = {},
|
||||
--
|
||||
|
||||
@ -67,7 +67,7 @@ index 5cac3d1..813b1b4 100644
|
||||
lua_ls = {
|
||||
-- cmd = { ... },
|
||||
-- filetypes = { ... },
|
||||
@@ -685,6 +714,32 @@ require('lazy').setup({
|
||||
@@ -696,6 +725,32 @@ require('lazy').setup({
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -100,7 +100,7 @@ index 5cac3d1..813b1b4 100644
|
||||
}
|
||||
|
||||
-- Ensure the servers and tools above are installed
|
||||
@@ -716,6 +771,33 @@ require('lazy').setup({
|
||||
@@ -727,6 +782,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 5cac3d1..813b1b4 100644
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
@@ -875,6 +957,7 @@ require('lazy').setup({
|
||||
@@ -884,6 +966,7 @@ require('lazy').setup({
|
||||
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
||||
group_index = 0,
|
||||
},
|
||||
@ -142,7 +142,7 @@ index 5cac3d1..813b1b4 100644
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
{ name = 'path' },
|
||||
@@ -890,19 +973,37 @@ require('lazy').setup({
|
||||
@@ -899,19 +982,37 @@ require('lazy').setup({
|
||||
--
|
||||
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
||||
'folke/tokyonight.nvim',
|
||||
@ -186,7 +186,7 @@ index 5cac3d1..813b1b4 100644
|
||||
end,
|
||||
},
|
||||
|
||||
@@ -952,7 +1053,39 @@ require('lazy').setup({
|
||||
@@ -961,7 +1062,39 @@ require('lazy').setup({
|
||||
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
|
||||
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
||||
opts = {
|
||||
@ -227,7 +227,7 @@ index 5cac3d1..813b1b4 100644
|
||||
-- Autoinstall languages that are not installed
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
@@ -982,17 +1115,17 @@ require('lazy').setup({
|
||||
@@ -991,17 +1124,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