not working complete nvim move
This commit is contained in:
parent
b1bbae5932
commit
d60d88a930
|
@ -57,7 +57,6 @@ in
|
||||||
clojure-lsp
|
clojure-lsp
|
||||||
rnix-lsp
|
rnix-lsp
|
||||||
terraform-lsp
|
terraform-lsp
|
||||||
nodePackages.typescript-lsp-server
|
|
||||||
# Other LSPs
|
# Other LSPs
|
||||||
( neovim.override {
|
( neovim.override {
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
@ -79,7 +78,7 @@ in
|
||||||
vim-surround
|
vim-surround
|
||||||
bufferline-nvim
|
bufferline-nvim
|
||||||
feline-nvim
|
feline-nvim
|
||||||
nvim-webdev-icons
|
nvim-web-devicons
|
||||||
vim-devicons
|
vim-devicons
|
||||||
# kitaab stuff
|
# kitaab stuff
|
||||||
vimwiki
|
vimwiki
|
||||||
|
@ -89,17 +88,14 @@ in
|
||||||
plenary-nvim
|
plenary-nvim
|
||||||
# lsp stuff
|
# lsp stuff
|
||||||
ale
|
ale
|
||||||
black-vim
|
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
nvim-cmp
|
nvim-cmp
|
||||||
nvim-cmp-lsp
|
cmp-nvim-lsp
|
||||||
nvim-lsp-ts-utils
|
nvim-lsp-ts-utils
|
||||||
cmp-conjure
|
cmp-conjure
|
||||||
cmp-buffer
|
cmp-buffer
|
||||||
cmp-tabnine
|
cmp-tabnine
|
||||||
lspkind-nvim
|
lspkind-nvim
|
||||||
luasnip
|
|
||||||
cmp_luasnip
|
|
||||||
# git stuff
|
# git stuff
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
gitsigns-nvim
|
gitsigns-nvim
|
||||||
|
@ -274,10 +270,6 @@ in
|
||||||
nnoremap <leader>vsd :lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics()<CR>
|
nnoremap <leader>vsd :lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics()<CR>
|
||||||
nnoremap <leader>vn :lua vim.lsp.diagnostic.goto_next()<CR>
|
nnoremap <leader>vn :lua vim.lsp.diagnostic.goto_next()<CR>
|
||||||
nnoremap <leader>vll :call LspLocationList()<CR>
|
nnoremap <leader>vll :call LspLocationList()<CR>
|
||||||
augroup THE_PRIMEAGEN_LSP
|
|
||||||
autocmd!
|
|
||||||
autocmd! BufWrite,BufEnter,InsertLeave * :call LspLocationList()
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
"bufferline
|
"bufferline
|
||||||
" These commands will navigate through buffers in order regardless of which mode you are using
|
" These commands will navigate through buffers in order regardless of which mode you are using
|
||||||
|
@ -286,46 +278,9 @@ in
|
||||||
|
|
||||||
" lua config
|
" lua config
|
||||||
lua <<EOF
|
lua <<EOF
|
||||||
-- luasnip
|
|
||||||
M.luasnip = function(override_flag)
|
|
||||||
local present, luasnip = pcall(require, "luasnip")
|
|
||||||
if present then
|
|
||||||
local default = {
|
|
||||||
history = true,
|
|
||||||
updateevents = "TextChanged,TextChangedI",
|
|
||||||
}
|
|
||||||
if override_flag then
|
|
||||||
default = require("core.utils").tbl_override_req("luasnip", default)
|
|
||||||
end
|
|
||||||
luasnip.config.set_config(default)
|
|
||||||
require("luasnip/loaders/from_vscode").load { paths = chadrc_config.plugins.options.luasnip.snippet_path }
|
|
||||||
require("luasnip/loaders/from_vscode").load()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Setup nvim-cmp.
|
-- Setup nvim-cmp.
|
||||||
local cmp = require'cmp'
|
local cmp = require'cmp'
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
formatting = {
|
|
||||||
format = function(entry, vim_item)
|
|
||||||
local icons = require "plugins.configs.lspkind_icons"
|
|
||||||
vim_item.kind = string.format("%s %s", icons[vim_item.kind], vim_item.kind)
|
|
||||||
vim_item.menu = ({
|
|
||||||
nvim_lsp = "[LSP]",
|
|
||||||
clojure_lsp = "[CLJ]",
|
|
||||||
buffer = "[BUF]",
|
|
||||||
terraform_lsp = "[TER]",
|
|
||||||
pylsp = "[PY]",
|
|
||||||
rnix-lsp = "[NIX]",
|
|
||||||
})[entry.source.name]
|
|
||||||
return vim_item
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
mapping = {
|
mapping = {
|
||||||
['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
|
['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
|
||||||
['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
|
['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
|
||||||
|
@ -339,7 +294,6 @@ in
|
||||||
},
|
},
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'luasnip' }, -- For luasnip users.
|
|
||||||
}, {
|
}, {
|
||||||
{ name = 'buffer' },
|
{ name = 'buffer' },
|
||||||
})
|
})
|
||||||
|
@ -347,7 +301,7 @@ in
|
||||||
-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
|
-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
|
||||||
cmp.setup.cmdline('/', {
|
cmp.setup.cmdline('/', {
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'buffer' }
|
{ name = 'buffer' },
|
||||||
{ name = "nvim_lsp"},
|
{ name = "nvim_lsp"},
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
{ name = 'conjure'},
|
{ name = 'conjure'},
|
||||||
|
@ -365,9 +319,11 @@ in
|
||||||
|
|
||||||
-- Setup lspconfig.
|
-- Setup lspconfig.
|
||||||
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
require('lspconfig')['nvim_lsp', clojure_lsp', 'rnix-lsp', 'pylsp', 'terraform_lsp', 'tsserver'].setup {
|
require'lspconfig'nvim_lsp.setup {}
|
||||||
capabilities = capabilities
|
require'lspconfig'clojure_lsp.setup {}
|
||||||
}
|
require'lspconfig'rnix.setup {}
|
||||||
|
require'lspconfig'pylsp.setup {}
|
||||||
|
require'lspconfig'terraform_lsp.setup {}
|
||||||
|
|
||||||
-- Feline
|
-- Feline
|
||||||
local colors = require 'theme.colors'
|
local colors = require 'theme.colors'
|
||||||
|
@ -628,77 +584,7 @@ in
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Buffeline
|
-- Buffeline
|
||||||
require('bufferline').setup {
|
require('bufferline').setup {}
|
||||||
options = {
|
|
||||||
numbers = "ordinal",
|
|
||||||
--- @deprecated, please specify numbers as a function to customize the styling
|
|
||||||
number_style = "superscript",
|
|
||||||
close_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
|
|
||||||
right_mouse_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
|
|
||||||
left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions"
|
|
||||||
middle_mouse_command = nil, -- can be a string | function, see "Mouse actions"
|
|
||||||
-- NOTE: this plugin is designed with this icon in mind,
|
|
||||||
-- and so changing this is NOT recommended, this is intended
|
|
||||||
-- as an escape hatch for people who cannot bear it for whatever reason
|
|
||||||
indicator_icon = '▎',
|
|
||||||
buffer_close_icon = '',
|
|
||||||
modified_icon = '●',
|
|
||||||
close_icon = '',
|
|
||||||
left_trunc_marker = '',
|
|
||||||
right_trunc_marker = '',
|
|
||||||
--- name_formatter can be used to change the buffer's label in the bufferline.
|
|
||||||
--- Please note some names can/will break the
|
|
||||||
--- bufferline so use this at your discretion knowing that it has
|
|
||||||
--- some limitations that will *NOT* be fixed.
|
|
||||||
name_formatter = function(buf) -- buf contains a "name", "path" and "bufnr"
|
|
||||||
-- remove extension from markdown files for example
|
|
||||||
if buf.name:match('%.md') then
|
|
||||||
return vim.fn.fnamemodify(buf.name, ':t:r')
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
max_name_length = 18,
|
|
||||||
max_prefix_length = 15, -- prefix used when a buffer is de-duplicated
|
|
||||||
tab_size = 18,
|
|
||||||
diagnostics = "nvim_lsp",
|
|
||||||
diagnostics_update_in_insert = false,
|
|
||||||
diagnostics_indicator = function(count, level, diagnostics_dict, context)
|
|
||||||
return "("..count..")"
|
|
||||||
end,
|
|
||||||
-- NOTE: this will be called a lot so don't do any heavy processing here
|
|
||||||
custom_filter = function(buf_number, buf_numbers)
|
|
||||||
-- filter out filetypes you don't want to see
|
|
||||||
if vim.bo[buf_number].filetype ~= "<i-dont-want-to-see-this>" then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
-- filter out by buffer name
|
|
||||||
if vim.fn.bufname(buf_number) ~= "<buffer-name-I-dont-want>" then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
-- filter out based on arbitrary rules
|
|
||||||
-- e.g. filter out vim wiki buffer from tabline in your work repo
|
|
||||||
if vim.fn.getcwd() == "<work-repo>" and vim.bo[buf_number].filetype ~= "wiki" then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
-- filter out by it's index number in list (don't show first buffer)
|
|
||||||
if buf_numbers[1] ~= buf_number then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
-- offsets = {{filetype = "NvimTree", text = "File Explorer" | function , text_align = "left" | "center" | "right"}},
|
|
||||||
show_buffer_icons = true, -- disable filetype icons for buffers
|
|
||||||
show_buffer_close_icons = false,
|
|
||||||
show_close_icon = false,
|
|
||||||
show_tab_indicators = true,
|
|
||||||
persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
|
|
||||||
-- can also be a table containing 2 custom separators
|
|
||||||
-- [focused and unfocused]. eg: { '|', '|' }
|
|
||||||
separator_style = "thick",
|
|
||||||
enforce_regular_tabs = true,
|
|
||||||
always_show_bufferline = true,
|
|
||||||
sort_by = 'relative_directory'
|
|
||||||
end
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue