feat(neovim): upgrade kickstart.nvim to latest commit
Also, adjust supermaven to work with blink.cmp.
This commit is contained in:
parent
1513baa542
commit
7e15d34664
@ -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
|
&& echo 'alias nh="nvim --listen 0.0.0.0:6666 --headless &> /dev/null"' >> ${XDG_CONFIG_HOME}/fish/config.fish
|
||||||
|
|
||||||
# git configuration
|
# git configuration
|
||||||
ENV NEOVIM_KICKSTART_VERSION e947649cb0ee5ac3c75593288df04d4f58359106
|
ENV NEOVIM_KICKSTART_VERSION d350db2449da40df003c40d440f909d74e2d4e70
|
||||||
COPY ./patch/kickstart.nvim/updates.patch /tmp
|
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 \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git a/init.lua b/init.lua
|
diff --git a/init.lua b/init.lua
|
||||||
index cbf9ff6..0205207 100644
|
index 776c687..45f3af0 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 cbf9ff6..0205207 100644
|
|||||||
-- [[ Basic Keymaps ]]
|
-- [[ Basic Keymaps ]]
|
||||||
-- See `:help vim.keymap.set()`
|
-- See `:help vim.keymap.set()`
|
||||||
|
|
||||||
@@ -682,6 +690,27 @@ require('lazy').setup({
|
@@ -676,6 +684,27 @@ require('lazy').setup({
|
||||||
-- ts_ls = {},
|
-- ts_ls = {},
|
||||||
--
|
--
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ index cbf9ff6..0205207 100644
|
|||||||
lua_ls = {
|
lua_ls = {
|
||||||
-- cmd = { ... },
|
-- cmd = { ... },
|
||||||
-- filetypes = { ... },
|
-- filetypes = { ... },
|
||||||
@@ -696,6 +725,32 @@ require('lazy').setup({
|
@@ -690,6 +719,32 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -100,7 +100,7 @@ index cbf9ff6..0205207 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- Ensure the servers and tools above are installed
|
-- Ensure the servers and tools above are installed
|
||||||
@@ -727,6 +782,33 @@ require('lazy').setup({
|
@@ -721,6 +776,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 {})
|
||||||
@ -134,15 +134,33 @@ index cbf9ff6..0205207 100644
|
|||||||
require('lspconfig')[server_name].setup(server)
|
require('lspconfig')[server_name].setup(server)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
@@ -884,6 +966,7 @@ require('lazy').setup({
|
@@ -801,6 +883,8 @@ require('lazy').setup({
|
||||||
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
opts = {},
|
||||||
group_index = 0,
|
},
|
||||||
},
|
'folke/lazydev.nvim',
|
||||||
+ { name = 'supermavem' },
|
+ 'saghen/blink.compat',
|
||||||
{ name = 'nvim_lsp' },
|
+ 'supermaven-inc/supermaven-nvim',
|
||||||
{ name = 'luasnip' },
|
},
|
||||||
{ name = 'path' },
|
--- @module 'blink.cmp'
|
||||||
@@ -899,19 +982,37 @@ require('lazy').setup({
|
--- @type blink.cmp.Config
|
||||||
|
@@ -846,9 +930,15 @@ require('lazy').setup({
|
||||||
|
},
|
||||||
|
|
||||||
|
sources = {
|
||||||
|
- default = { 'lsp', 'path', 'snippets', 'lazydev' },
|
||||||
|
+ default = { 'lsp', 'path', 'snippets', 'lazydev', 'supermaven' },
|
||||||
|
providers = {
|
||||||
|
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
|
||||||
|
+ supermaven = {
|
||||||
|
+ name = 'supermanve',
|
||||||
|
+ module = 'blink.compat.source',
|
||||||
|
+ score_offset = 100,
|
||||||
|
+ async = true,
|
||||||
|
+ },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
@@ -874,19 +964,37 @@ require('lazy').setup({
|
||||||
--
|
--
|
||||||
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
||||||
'folke/tokyonight.nvim',
|
'folke/tokyonight.nvim',
|
||||||
@ -186,7 +204,7 @@ index cbf9ff6..0205207 100644
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -961,7 +1062,39 @@ require('lazy').setup({
|
@@ -936,7 +1044,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 = {
|
||||||
@ -227,7 +245,7 @@ index cbf9ff6..0205207 100644
|
|||||||
-- Autoinstall languages that are not installed
|
-- Autoinstall languages that are not installed
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
highlight = {
|
highlight = {
|
||||||
@@ -991,17 +1124,17 @@ require('lazy').setup({
|
@@ -966,17 +1106,17 @@ 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',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user