feat(neovim): update kickstart.nvim
to latest commit (#229)
Commit [`6ba2408`][0].
Reviewed-on: #229
[0]: 6ba2408cdf
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
6231ed1bdc
commit
c1459b8ec1
@ -194,7 +194,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 d350db2449da40df003c40d440f909d74e2d4e70
|
||||
ENV NEOVIM_KICKSTART_VERSION 6ba2408cdf5eb7a0e4b62c7d6fab63b64dd720f6
|
||||
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 776c687..6ae630e 100644
|
||||
index b98ffc6..f0cf036 100644
|
||||
--- a/init.lua
|
||||
+++ b/init.lua
|
||||
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
||||
@ -10,23 +10,23 @@ index 776c687..6ae630e 100644
|
||||
+vim.g.have_nerd_font = true
|
||||
|
||||
-- [[ Setting options ]]
|
||||
-- See `:help vim.opt`
|
||||
-- See `:help vim.o`
|
||||
@@ -102,10 +102,10 @@ vim.g.have_nerd_font = false
|
||||
vim.opt.number = true
|
||||
vim.o.number = true
|
||||
-- You can also add relative line numbers, to help with jumping.
|
||||
-- Experiment for yourself to see if you like it!
|
||||
--- vim.opt.relativenumber = true
|
||||
+vim.opt.relativenumber = true
|
||||
--- vim.o.relativenumber = true
|
||||
+vim.o.relativenumber = true
|
||||
|
||||
-- Enable mouse mode, can be useful for resizing splits for example!
|
||||
-vim.opt.mouse = 'a'
|
||||
+vim.opt.mouse = ''
|
||||
-vim.o.mouse = 'a'
|
||||
+vim.o.mouse = ''
|
||||
|
||||
-- Don't show the mode, since it's already in the status line
|
||||
vim.opt.showmode = false
|
||||
@@ -161,6 +161,14 @@ vim.opt.scrolloff = 10
|
||||
vim.o.showmode = false
|
||||
@@ -166,6 +166,14 @@ vim.o.scrolloff = 10
|
||||
-- See `:help 'confirm'`
|
||||
vim.opt.confirm = true
|
||||
vim.o.confirm = true
|
||||
|
||||
+-- Set foldmethod
|
||||
+-- See `:help foldmethod`
|
||||
@ -39,7 +39,7 @@ index 776c687..6ae630e 100644
|
||||
-- [[ Basic Keymaps ]]
|
||||
-- See `:help vim.keymap.set()`
|
||||
|
||||
@@ -632,9 +640,9 @@ require('lazy').setup({
|
||||
@@ -640,9 +648,9 @@ require('lazy').setup({
|
||||
[vim.diagnostic.severity.HINT] = ' ',
|
||||
},
|
||||
} or {},
|
||||
@ -52,7 +52,7 @@ index 776c687..6ae630e 100644
|
||||
format = function(diagnostic)
|
||||
local diagnostic_message = {
|
||||
[vim.diagnostic.severity.ERROR] = diagnostic.message,
|
||||
@@ -644,6 +652,7 @@ require('lazy').setup({
|
||||
@@ -652,6 +660,7 @@ require('lazy').setup({
|
||||
}
|
||||
return diagnostic_message[diagnostic.severity]
|
||||
end,
|
||||
@ -60,7 +60,7 @@ index 776c687..6ae630e 100644
|
||||
},
|
||||
}
|
||||
|
||||
@@ -676,6 +685,28 @@ require('lazy').setup({
|
||||
@@ -684,6 +693,28 @@ require('lazy').setup({
|
||||
-- ts_ls = {},
|
||||
--
|
||||
|
||||
@ -89,7 +89,7 @@ index 776c687..6ae630e 100644
|
||||
lua_ls = {
|
||||
-- cmd = { ... },
|
||||
-- filetypes = { ... },
|
||||
@@ -690,6 +721,32 @@ require('lazy').setup({
|
||||
@@ -698,6 +729,32 @@ require('lazy').setup({
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -122,7 +122,7 @@ index 776c687..6ae630e 100644
|
||||
}
|
||||
|
||||
-- Ensure the servers and tools above are installed
|
||||
@@ -721,6 +778,33 @@ require('lazy').setup({
|
||||
@@ -729,6 +786,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 {})
|
||||
@ -156,7 +156,7 @@ index 776c687..6ae630e 100644
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
@@ -801,6 +885,8 @@ require('lazy').setup({
|
||||
@@ -809,6 +893,8 @@ require('lazy').setup({
|
||||
opts = {},
|
||||
},
|
||||
'folke/lazydev.nvim',
|
||||
@ -165,7 +165,7 @@ index 776c687..6ae630e 100644
|
||||
},
|
||||
--- @module 'blink.cmp'
|
||||
--- @type blink.cmp.Config
|
||||
@@ -846,9 +932,15 @@ require('lazy').setup({
|
||||
@@ -854,9 +940,15 @@ require('lazy').setup({
|
||||
},
|
||||
|
||||
sources = {
|
||||
@ -182,7 +182,7 @@ index 776c687..6ae630e 100644
|
||||
},
|
||||
},
|
||||
|
||||
@@ -874,19 +966,39 @@ require('lazy').setup({
|
||||
@@ -882,19 +974,39 @@ require('lazy').setup({
|
||||
--
|
||||
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
||||
'folke/tokyonight.nvim',
|
||||
@ -228,7 +228,7 @@ index 776c687..6ae630e 100644
|
||||
end,
|
||||
},
|
||||
|
||||
@@ -936,7 +1048,39 @@ require('lazy').setup({
|
||||
@@ -944,7 +1056,39 @@ require('lazy').setup({
|
||||
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
|
||||
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
||||
opts = {
|
||||
@ -269,7 +269,7 @@ index 776c687..6ae630e 100644
|
||||
-- Autoinstall languages that are not installed
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
@@ -966,17 +1110,17 @@ require('lazy').setup({
|
||||
@@ -974,17 +1118,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