fix: update to neovim 0.7 and format
This commit is contained in:
@@ -1,13 +1,14 @@
|
|||||||
-- LSP
|
-- LSP
|
||||||
require'lspconfig'.gopls.setup{
|
require 'lspconfig'.gopls.setup {
|
||||||
-- cmd = {DATA_PATH .. "/lspinstall/go/gopls"},
|
-- cmd = {DATA_PATH .. "/lspinstall/go/gopls"},
|
||||||
cmd = {"gopls","serve"}, -- use cmd in path, I can update it easily
|
cmd = { "gopls", "serve" }, -- use cmd in path, I can update it easily
|
||||||
settings = {gopls = {analyses = {unusedparams = true}, staticcheck = true}},
|
settings = { gopls = { analyses = { unusedparams = true }, staticcheck = true } },
|
||||||
root_dir = require'lspconfig'.util.root_pattern(".git","go.mod","go.work"),
|
root_dir = require 'lspconfig'.util.root_pattern(".git", "go.mod", "go.work"),
|
||||||
init_options = {usePlaceholders = true, completeUnimported = true},
|
init_options = { usePlaceholders = true, completeUnimported = true },
|
||||||
on_attach = require'lsp'.common_on_attach
|
on_attach = require 'lsp'.common_on_attach
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--[[
|
||||||
require'dap-install'.config("go_delve",{})
|
require'dap-install'.config("go_delve",{})
|
||||||
|
|
||||||
-- DAP
|
-- DAP
|
||||||
|
|||||||
+7
-6
@@ -1,22 +1,22 @@
|
|||||||
-- TODO figure out why this don't work
|
-- TODO figure out why this don't work
|
||||||
vim.fn.sign_define(
|
vim.fn.sign_define(
|
||||||
"LspDiagnosticsSignError",
|
"LspDiagnosticsSignError",
|
||||||
{texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError"}
|
{ texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError" }
|
||||||
)
|
)
|
||||||
vim.fn.sign_define(
|
vim.fn.sign_define(
|
||||||
"LspDiagnosticsSignWarning",
|
"LspDiagnosticsSignWarning",
|
||||||
{texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning"}
|
{ texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning" }
|
||||||
)
|
)
|
||||||
vim.fn.sign_define(
|
vim.fn.sign_define(
|
||||||
"LspDiagnosticsSignHint",
|
"LspDiagnosticsSignHint",
|
||||||
{texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint"}
|
{ texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint" }
|
||||||
)
|
)
|
||||||
vim.fn.sign_define(
|
vim.fn.sign_define(
|
||||||
"LspDiagnosticsSignInformation",
|
"LspDiagnosticsSignInformation",
|
||||||
{texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation"}
|
{ texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" }
|
||||||
)
|
)
|
||||||
|
|
||||||
vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
vim.cmd("nnoremap gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
||||||
@@ -93,11 +93,12 @@ local function documentHighlight(client, bufnr)
|
|||||||
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
|
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
|
||||||
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
||||||
augroup END
|
augroup END
|
||||||
]],
|
]] ,
|
||||||
false
|
false
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local lsp_config = {}
|
local lsp_config = {}
|
||||||
|
|
||||||
if O.document_highlight then
|
if O.document_highlight then
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ require('pluginconfig/fzf-lua')
|
|||||||
require('pluginconfig/nvim-tree') -- This plugin must be required somewhere before colorscheme. Placing it after will break navigation keymappings
|
require('pluginconfig/nvim-tree') -- This plugin must be required somewhere before colorscheme. Placing it after will break navigation keymappings
|
||||||
require('pluginconfig/nvim-treesitter')
|
require('pluginconfig/nvim-treesitter')
|
||||||
require('pluginconfig/rnvimr')
|
require('pluginconfig/rnvimr')
|
||||||
require('pluginconfig/symbols-outline')
|
|
||||||
require('pluginconfig/telescope')
|
require('pluginconfig/telescope')
|
||||||
require('pluginconfig/toggleterm')
|
require('pluginconfig/toggleterm')
|
||||||
require('pluginconfig/vim-matchup')
|
require('pluginconfig/vim-matchup')
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
local treesitter = {
|
local treesitter = {
|
||||||
ensure_installed = "all",
|
ensure_installed = "all",
|
||||||
highlight = {enabled = true},
|
highlight = { enabled = true },
|
||||||
playground = {enabled = true},
|
playground = { enabled = true },
|
||||||
rainbow = {enabled = false},
|
rainbow = { enabled = false },
|
||||||
}
|
}
|
||||||
|
|
||||||
require'nvim-treesitter.configs'.setup {
|
require 'nvim-treesitter.configs'.setup {
|
||||||
ensure_installed = treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
ensure_installed = treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
||||||
ignore_install = {"haskell", "markdown"},
|
ignore_install = { "haskell", "markdown", "swift" },
|
||||||
matchup = {
|
matchup = {
|
||||||
enable = true, -- mandatory, false will disable the whole extension
|
enable = true, -- mandatory, false will disable the whole extension
|
||||||
-- disable = { "c", "ruby" }, -- optional, list of language that will be disabled
|
-- disable = { "c", "ruby" }, -- optional, list of language that will be disabled
|
||||||
},
|
},
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = treesitter.highlight.enabled, -- false will disable the whole extension
|
enable = true, -- false will disable the whole extension
|
||||||
disable = { "markdown" },
|
disable = { "markdown" },
|
||||||
},
|
},
|
||||||
context_commentstring = {
|
context_commentstring = {
|
||||||
@@ -24,7 +24,6 @@ require'nvim-treesitter.configs'.setup {
|
|||||||
},
|
},
|
||||||
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
|
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
|
||||||
-- TODO seems to be broken
|
-- TODO seems to be broken
|
||||||
indent = {enable = {"javascriptreact"}},
|
indent = { enable = { "javascriptreact" } },
|
||||||
autotag = {enable = true},
|
autotag = { enable = true },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
vim.g.symbols_outline = {
|
|
||||||
highlight_hovered_item = true,
|
|
||||||
show_guides = true,
|
|
||||||
auto_preview = true,
|
|
||||||
position = 'right',
|
|
||||||
keymaps = {
|
|
||||||
close = "<Esc>",
|
|
||||||
goto_location = "<Cr>",
|
|
||||||
focus_location = "o",
|
|
||||||
hover_symbol = "<C-space>",
|
|
||||||
rename_symbol = "r",
|
|
||||||
code_actions = "a",
|
|
||||||
},
|
|
||||||
lsp_blacklist = {},
|
|
||||||
}
|
|
||||||
+52
-54
@@ -35,17 +35,17 @@ return require("packer").startup(function(use)
|
|||||||
use "wbthomason/packer.nvim"
|
use "wbthomason/packer.nvim"
|
||||||
|
|
||||||
-- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)
|
-- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)
|
||||||
use {"neovim/nvim-lspconfig", opt = true}
|
use { "neovim/nvim-lspconfig", opt = true }
|
||||||
use {'tami5/lspsaga.nvim', branch = 'nvim6.0', opt=true}
|
use { 'tami5/lspsaga.nvim', branch = 'nvim6.0', opt = true }
|
||||||
use {"williamboman/nvim-lsp-installer", opt = true}
|
use { "williamboman/nvim-lsp-installer", opt = true }
|
||||||
use {"folke/trouble.nvim", opt = true}
|
use { "folke/trouble.nvim", opt = true }
|
||||||
|
|
||||||
-- Telescope
|
-- Telescope
|
||||||
use {"nvim-lua/popup.nvim", opt = true}
|
use { "nvim-lua/popup.nvim", opt = true }
|
||||||
use {"nvim-lua/plenary.nvim", opt = true}
|
use { "nvim-lua/plenary.nvim", opt = true }
|
||||||
use {"nvim-telescope/telescope.nvim", opt = true}
|
use { "nvim-telescope/telescope.nvim", opt = true }
|
||||||
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
||||||
use {"nvim-telescope/telescope-project.nvim", opt = true}
|
use { "nvim-telescope/telescope-project.nvim", opt = true }
|
||||||
use { "nvim-telescope/telescope-file-browser.nvim" }
|
use { "nvim-telescope/telescope-file-browser.nvim" }
|
||||||
|
|
||||||
use { 'ibhagwan/fzf-lua',
|
use { 'ibhagwan/fzf-lua',
|
||||||
@@ -53,69 +53,69 @@ return require("packer").startup(function(use)
|
|||||||
requires = { 'kyazdani42/nvim-web-devicons' }
|
requires = { 'kyazdani42/nvim-web-devicons' }
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'folke/lua-dev.nvim'}
|
use { 'folke/lua-dev.nvim' }
|
||||||
use {"rafcamlet/nvim-luapad"}
|
use { "rafcamlet/nvim-luapad" }
|
||||||
|
|
||||||
-- Debugging
|
-- Debugging
|
||||||
use {"mfussenegger/nvim-dap", opt = true}
|
use { "mfussenegger/nvim-dap", opt = true }
|
||||||
|
|
||||||
-- Autocomplete
|
-- Autocomplete
|
||||||
use {"hrsh7th/nvim-compe", opt = true}
|
use { "hrsh7th/nvim-compe", opt = true }
|
||||||
use {"hrsh7th/vim-vsnip", opt = true}
|
use { "hrsh7th/vim-vsnip", opt = true }
|
||||||
use {"rafamadriz/friendly-snippets", opt = true}
|
use { "rafamadriz/friendly-snippets", opt = true }
|
||||||
|
|
||||||
-- Treesitter
|
-- Treesitter
|
||||||
use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}
|
use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
|
||||||
use {"windwp/nvim-ts-autotag", opt = true}
|
use { "windwp/nvim-ts-autotag", opt = true }
|
||||||
use {'andymass/vim-matchup', opt = true}
|
use { 'andymass/vim-matchup', opt = true }
|
||||||
|
|
||||||
-- Explorer
|
-- Explorer
|
||||||
use {
|
use {
|
||||||
'kyazdani42/nvim-tree.lua',
|
'kyazdani42/nvim-tree.lua',
|
||||||
requires = 'kyazdani42/nvim-web-devicons',
|
requires = 'kyazdani42/nvim-web-devicons',
|
||||||
opt = true,
|
opt = true,
|
||||||
config = function() require'nvim-tree'.setup {} end
|
config = function() require 'nvim-tree'.setup {} end
|
||||||
}
|
}
|
||||||
use {"ahmedkhalf/lsp-rooter.nvim", opt = true} -- with this nvim-tree will follow you
|
use { "ahmedkhalf/lsp-rooter.nvim", opt = true } -- with this nvim-tree will follow you
|
||||||
-- TODO remove when open on dir is supported by nvimtree
|
-- TODO remove when open on dir is supported by nvimtree
|
||||||
use "kevinhwang91/rnvimr"
|
use "kevinhwang91/rnvimr"
|
||||||
|
|
||||||
-- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
|
-- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
|
||||||
use { 'lewis6991/gitsigns.nvim', opt = true, requires = { 'nvim-lua/plenary.nvim' } }
|
use { 'lewis6991/gitsigns.nvim', opt = true, requires = { 'nvim-lua/plenary.nvim' } }
|
||||||
use {"folke/which-key.nvim", opt = true}
|
use { "folke/which-key.nvim", opt = true }
|
||||||
use {"ChristianChiarulli/dashboard-nvim", opt = true}
|
use { "ChristianChiarulli/dashboard-nvim", opt = true }
|
||||||
use {"windwp/nvim-autopairs", opt = true}
|
use { "windwp/nvim-autopairs", opt = true }
|
||||||
use {"kevinhwang91/nvim-bqf", opt = true}
|
use { "kevinhwang91/nvim-bqf", opt = true }
|
||||||
|
|
||||||
-- Comments
|
-- Comments
|
||||||
use {"terrortylor/nvim-comment", opt = true}
|
use { "terrortylor/nvim-comment", opt = true }
|
||||||
use {'JoosepAlviste/nvim-ts-context-commentstring', opt = true}
|
use { 'JoosepAlviste/nvim-ts-context-commentstring', opt = true }
|
||||||
|
|
||||||
-- Color
|
-- Color
|
||||||
use {"christianchiarulli/nvcode-color-schemes.vim", opt = true}
|
use { "christianchiarulli/nvcode-color-schemes.vim", opt = true }
|
||||||
use {"npxbr/gruvbox.nvim", requires = {"rktjmp/lush.nvim"}}
|
use { "npxbr/gruvbox.nvim", requires = { "rktjmp/lush.nvim" } }
|
||||||
|
|
||||||
-- Icons
|
-- Icons
|
||||||
use {"kyazdani42/nvim-web-devicons", opt = true}
|
use { "kyazdani42/nvim-web-devicons", opt = true }
|
||||||
|
|
||||||
-- Status Line and Bufferline
|
-- Status Line and Bufferline
|
||||||
use {"glepnir/galaxyline.nvim", opt = true}
|
use { "glepnir/galaxyline.nvim", opt = true }
|
||||||
use {"romgrk/barbar.nvim", opt = true}
|
use { "romgrk/barbar.nvim", opt = true }
|
||||||
|
|
||||||
-- Go plugin
|
-- Go plugin
|
||||||
-- use {"fatih/vim-go", run= ":GoUpdateBinaries"}
|
-- use {"fatih/vim-go", run= ":GoUpdateBinaries"}
|
||||||
-- use {"fatih/vim-go", run = ":GoUpdateBinaries", ft = "go"}
|
-- use {"fatih/vim-go", run = ":GoUpdateBinaries", ft = "go"}
|
||||||
-- require_plugin("fatih/vim-go")
|
-- require_plugin("fatih/vim-go")
|
||||||
-- debuger
|
-- debuger
|
||||||
use {"puremourning/vimspector", opt=true}
|
use { "puremourning/vimspector", opt = true }
|
||||||
require_plugin("vimspector")
|
require_plugin("vimspector")
|
||||||
|
|
||||||
-- vim test
|
-- vim test
|
||||||
use {"vim-test/vim-test", opt=true}
|
use { "vim-test/vim-test", opt = true }
|
||||||
require_plugin("vim-test")
|
require_plugin("vim-test")
|
||||||
use {"kyoh86/vim-go-coverage", opt=true, ft="go"}
|
use { "kyoh86/vim-go-coverage", opt = true, ft = "go" }
|
||||||
require_plugin("vim-go-coverage")
|
require_plugin("vim-go-coverage")
|
||||||
use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} }
|
use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } }
|
||||||
|
|
||||||
-- Sane gx for netrw_gx bug
|
-- Sane gx for netrw_gx bug
|
||||||
-- use {"felipec/vim-sanegx"}
|
-- use {"felipec/vim-sanegx"}
|
||||||
@@ -150,18 +150,18 @@ return require("packer").startup(function(use)
|
|||||||
require_plugin('lsp-rooter.nvim')
|
require_plugin('lsp-rooter.nvim')
|
||||||
require_plugin("nvim-ts-context-commentstring")
|
require_plugin("nvim-ts-context-commentstring")
|
||||||
|
|
||||||
use {'nvim-telescope/telescope-dap.nvim', opt=true}
|
use { 'nvim-telescope/telescope-dap.nvim', opt = true }
|
||||||
require_plugin("telescope-dap.nvim")
|
require_plugin("telescope-dap.nvim")
|
||||||
use {'theHamsta/nvim-dap-virtual-text', opt=true}
|
use { 'theHamsta/nvim-dap-virtual-text', opt = true }
|
||||||
require_plugin("nvim-dap-virtual-text")
|
require_plugin("nvim-dap-virtual-text")
|
||||||
|
|
||||||
use { "ray-x/lsp_signature.nvim"}
|
use { "ray-x/lsp_signature.nvim" }
|
||||||
use 'tanvirtin/monokai.nvim'
|
use 'tanvirtin/monokai.nvim'
|
||||||
use 'fratajczak/one-monokai-vim'
|
use 'fratajczak/one-monokai-vim'
|
||||||
use {"npxbr/glow.nvim", run = "GlowInstall"}
|
use { "npxbr/glow.nvim", run = "GlowInstall" }
|
||||||
|
|
||||||
use {"akinsho/nvim-toggleterm.lua"}
|
use { "akinsho/nvim-toggleterm.lua" }
|
||||||
use {"Pocco81/DAPInstall.nvim", opt=true}
|
use { "Pocco81/DAPInstall.nvim", opt = true }
|
||||||
require_plugin("DAPInstall.nvim")
|
require_plugin("DAPInstall.nvim")
|
||||||
|
|
||||||
use {
|
use {
|
||||||
@@ -169,17 +169,17 @@ return require("packer").startup(function(use)
|
|||||||
branch = 'v1', -- optional but strongly recommended
|
branch = 'v1', -- optional but strongly recommended
|
||||||
config = function()
|
config = function()
|
||||||
-- you can configure Hop the way you like here; see :h hop-config
|
-- you can configure Hop the way you like here; see :h hop-config
|
||||||
require'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
|
require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- markdown
|
-- markdown
|
||||||
use {'godlygeek/tabular'}
|
use { 'godlygeek/tabular' }
|
||||||
use {'preservim/vim-markdown'}
|
use { 'preservim/vim-markdown' }
|
||||||
use {
|
use {
|
||||||
'iamcco/markdown-preview.nvim',
|
'iamcco/markdown-preview.nvim',
|
||||||
run = function() vim.fn['mkdp#util#install']() end,
|
run = function() vim.fn['mkdp#util#install']() end,
|
||||||
ft = {'markdown'}
|
ft = { 'markdown' }
|
||||||
}
|
}
|
||||||
|
|
||||||
--use 'EdenEast/nightfox.nvim'
|
--use 'EdenEast/nightfox.nvim'
|
||||||
@@ -190,24 +190,22 @@ return require("packer").startup(function(use)
|
|||||||
|
|
||||||
-- Extras
|
-- Extras
|
||||||
if O.extras then
|
if O.extras then
|
||||||
use {'metakirby5/codi.vim', opt = true}
|
use { 'metakirby5/codi.vim', opt = true }
|
||||||
require_plugin('codi.vim')
|
require_plugin('codi.vim')
|
||||||
--use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install', opt = true}
|
--use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install', opt = true}
|
||||||
--require_plugin('markdown-preview.nvim')
|
--require_plugin('markdown-preview.nvim')
|
||||||
use {'numToStr/FTerm.nvim', opt = true}
|
use { 'numToStr/FTerm.nvim', opt = true }
|
||||||
require_plugin('FTerm.nvim')
|
require_plugin('FTerm.nvim')
|
||||||
use {'nacro90/numb.nvim', opt = true}
|
use { 'nacro90/numb.nvim', opt = true }
|
||||||
require_plugin('numb.nvim')
|
require_plugin('numb.nvim')
|
||||||
use {'turbio/bracey.vim', run = 'npm install --prefix server', opt = true}
|
use { 'turbio/bracey.vim', run = 'npm install --prefix server', opt = true }
|
||||||
require_plugin('bracey.vim')
|
require_plugin('bracey.vim')
|
||||||
|
|
||||||
use {'norcalli/nvim-colorizer.lua', opt = true}
|
use { 'norcalli/nvim-colorizer.lua', opt = true }
|
||||||
require_plugin('nvim-colorizer.lua')
|
require_plugin('nvim-colorizer.lua')
|
||||||
use {'windwp/nvim-spectre', opt = true}
|
use { 'windwp/nvim-spectre', opt = true }
|
||||||
require_plugin('nvim-spectre')
|
require_plugin('nvim-spectre')
|
||||||
use {'simrat39/symbols-outline.nvim', opt = true}
|
use { 'nvim-treesitter/playground', opt = true }
|
||||||
require_plugin('symbols-outline.nvim')
|
|
||||||
use {'nvim-treesitter/playground', opt = true}
|
|
||||||
require_plugin('playground')
|
require_plugin('playground')
|
||||||
-- folke/todo-comments.nvim
|
-- folke/todo-comments.nvim
|
||||||
-- gennaro-tedesco/nvim-jqx
|
-- gennaro-tedesco/nvim-jqx
|
||||||
|
|||||||
Reference in New Issue
Block a user