laily/.dotfile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update to neovim 0.7 and format

Browse Source
This commit is contained in:
laily
2022-04-27 10:53:33 +08:00
parent f1cd7327b7
commit c2f7626914
6 changed files with 87 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/lua/lang/go.lua
+8 -7
View File
@@ -1,13 +1,14 @@
-- LSP
require'lspconfig'.gopls.setup{
-- cmd = {DATA_PATH .. "/lspinstall/go/gopls"},
cmd = {"gopls","serve"}, -- use cmd in path, I can update it easily
settings = {gopls = {analyses = {unusedparams = true}, staticcheck = true}},
root_dir = require'lspconfig'.util.root_pattern(".git","go.mod","go.work"),
init_options = {usePlaceholders = true, completeUnimported = true},
on_attach = require'lsp'.common_on_attach
require 'lspconfig'.gopls.setup {
-- cmd = {DATA_PATH .. "/lspinstall/go/gopls"},
cmd = { "gopls", "serve" }, -- use cmd in path, I can update it easily
settings = { gopls = { analyses = { unusedparams = true }, staticcheck = true } },
root_dir = require 'lspconfig'.util.root_pattern(".git", "go.mod", "go.work"),
init_options = { usePlaceholders = true, completeUnimported = true },
on_attach = require 'lsp'.common_on_attach
}
--[[
require'dap-install'.config("go_delve",{})
-- DAP
nvim/lua/lsp.lua
+15 -14
View File
@@ -1,22 +1,22 @@
-- TODO figure out why this don't work
vim.fn.sign_define(
"LspDiagnosticsSignError",
{texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError"}
{ texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError" }
)
vim.fn.sign_define(
"LspDiagnosticsSignWarning",
{texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning"}
{ texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning" }
)
vim.fn.sign_define(
"LspDiagnosticsSignHint",
{texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint"}
{ texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint" }
)
vim.fn.sign_define(
"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> gr <cmd>lua vim.lsp.buf.references()<CR>")
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
@@ -34,14 +34,14 @@ vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").
-- Set Default Prefix.
-- Note: You can set a prefix per lsp server in the lv-globals.lua file
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics, {
virtual_text = {
prefix = "",
spacing = 0,
},
signs = true,
underline = true,
}
vim.lsp.diagnostic.on_publish_diagnostics, {
virtual_text = {
prefix = "",
spacing = 0,
},
signs = true,
underline = true,
}
)
-- symbols for autocomplete
@@ -93,11 +93,12 @@ local function documentHighlight(client, bufnr)
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
augroup END
]],
]] ,
false
)
end
end
local lsp_config = {}
if O.document_highlight then
nvim/lua/pluginconfig/init.lua
-1
View File
@@ -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-treesitter')
require('pluginconfig/rnvimr')
require('pluginconfig/symbols-outline')
require('pluginconfig/telescope')
require('pluginconfig/toggleterm')
require('pluginconfig/vim-matchup')
nvim/lua/pluginconfig/nvim-treesitter.lua
+11 -12
View File
@@ -1,30 +1,29 @@
local treesitter = {
ensure_installed = "all",
highlight = {enabled = true},
playground = {enabled = true},
rainbow = {enabled = false},
highlight = { enabled = true },
playground = { enabled = true },
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
ignore_install = {"haskell", "markdown"},
ignore_install = { "haskell", "markdown", "swift" },
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
},
highlight = {
enable = treesitter.highlight.enabled, -- false will disable the whole extension
enable = true, -- false will disable the whole extension
disable = { "markdown" },
},
context_commentstring = {
enable = true,
config = {
css = '// %s'
css = '// %s'
}
},
},
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
-- TODO seems to be broken
indent = {enable = {"javascriptreact"}},
autotag = {enable = true},
indent = { enable = { "javascriptreact" } },
autotag = { enable = true },
}
nvim/lua/pluginconfig/symbols-outline.lua
-15
View File
@@ -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 = {},
}
nvim/lua/plugins.lua
+52 -54
View File
@@ -35,17 +35,17 @@ return require("packer").startup(function(use)
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)
use {"neovim/nvim-lspconfig", opt = true}
use {'tami5/lspsaga.nvim', branch = 'nvim6.0', opt=true}
use {"williamboman/nvim-lsp-installer", opt = true}
use {"folke/trouble.nvim", opt = true}
use { "neovim/nvim-lspconfig", opt = true }
use { 'tami5/lspsaga.nvim', branch = 'nvim6.0', opt = true }
use { "williamboman/nvim-lsp-installer", opt = true }
use { "folke/trouble.nvim", opt = true }
-- Telescope
use {"nvim-lua/popup.nvim", opt = true}
use {"nvim-lua/plenary.nvim", opt = true}
use {"nvim-telescope/telescope.nvim", opt = true}
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
use {"nvim-telescope/telescope-project.nvim", opt = true}
use { "nvim-lua/popup.nvim", opt = true }
use { "nvim-lua/plenary.nvim", opt = true }
use { "nvim-telescope/telescope.nvim", opt = true }
use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
use { "nvim-telescope/telescope-project.nvim", opt = true }
use { "nvim-telescope/telescope-file-browser.nvim" }
use { 'ibhagwan/fzf-lua',
@@ -53,69 +53,69 @@ return require("packer").startup(function(use)
requires = { 'kyazdani42/nvim-web-devicons' }
}
use {'folke/lua-dev.nvim'}
use {"rafcamlet/nvim-luapad"}
use { 'folke/lua-dev.nvim' }
use { "rafcamlet/nvim-luapad" }
-- Debugging
use {"mfussenegger/nvim-dap", opt = true}
use { "mfussenegger/nvim-dap", opt = true }
-- Autocomplete
use {"hrsh7th/nvim-compe", opt = true}
use {"hrsh7th/vim-vsnip", opt = true}
use {"rafamadriz/friendly-snippets", opt = true}
use { "hrsh7th/nvim-compe", opt = true }
use { "hrsh7th/vim-vsnip", opt = true }
use { "rafamadriz/friendly-snippets", opt = true }
-- Treesitter
use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}
use {"windwp/nvim-ts-autotag", opt = true}
use {'andymass/vim-matchup', opt = true}
use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
use { "windwp/nvim-ts-autotag", opt = true }
use { 'andymass/vim-matchup', opt = true }
-- Explorer
use {
'kyazdani42/nvim-tree.lua',
requires = 'kyazdani42/nvim-web-devicons',
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
use "kevinhwang91/rnvimr"
-- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
use { 'lewis6991/gitsigns.nvim', opt = true, requires = { 'nvim-lua/plenary.nvim' } }
use {"folke/which-key.nvim", opt = true}
use {"ChristianChiarulli/dashboard-nvim", opt = true}
use {"windwp/nvim-autopairs", opt = true}
use {"kevinhwang91/nvim-bqf", opt = true}
use { "folke/which-key.nvim", opt = true }
use { "ChristianChiarulli/dashboard-nvim", opt = true }
use { "windwp/nvim-autopairs", opt = true }
use { "kevinhwang91/nvim-bqf", opt = true }
-- Comments
use {"terrortylor/nvim-comment", opt = true}
use {'JoosepAlviste/nvim-ts-context-commentstring', opt = true}
use { "terrortylor/nvim-comment", opt = true }
use { 'JoosepAlviste/nvim-ts-context-commentstring', opt = true }
-- Color
use {"christianchiarulli/nvcode-color-schemes.vim", opt = true}
use {"npxbr/gruvbox.nvim", requires = {"rktjmp/lush.nvim"}}
use { "christianchiarulli/nvcode-color-schemes.vim", opt = true }
use { "npxbr/gruvbox.nvim", requires = { "rktjmp/lush.nvim" } }
-- Icons
use {"kyazdani42/nvim-web-devicons", opt = true}
use { "kyazdani42/nvim-web-devicons", opt = true }
-- Status Line and Bufferline
use {"glepnir/galaxyline.nvim", opt = true}
use {"romgrk/barbar.nvim", opt = true}
use { "glepnir/galaxyline.nvim", opt = true }
use { "romgrk/barbar.nvim", opt = true }
-- Go plugin
-- use {"fatih/vim-go", run= ":GoUpdateBinaries"}
-- use {"fatih/vim-go", run = ":GoUpdateBinaries", ft = "go"}
-- require_plugin("fatih/vim-go")
-- debuger
use {"puremourning/vimspector", opt=true}
use { "puremourning/vimspector", opt = true }
require_plugin("vimspector")
-- vim test
use {"vim-test/vim-test", opt=true}
use { "vim-test/vim-test", opt = true }
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")
use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} }
use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } }
-- Sane gx for netrw_gx bug
-- use {"felipec/vim-sanegx"}
@@ -150,18 +150,18 @@ return require("packer").startup(function(use)
require_plugin('lsp-rooter.nvim')
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")
use {'theHamsta/nvim-dap-virtual-text', opt=true}
use { 'theHamsta/nvim-dap-virtual-text', opt = true }
require_plugin("nvim-dap-virtual-text")
use { "ray-x/lsp_signature.nvim"}
use { "ray-x/lsp_signature.nvim" }
use 'tanvirtin/monokai.nvim'
use 'fratajczak/one-monokai-vim'
use {"npxbr/glow.nvim", run = "GlowInstall"}
use { "npxbr/glow.nvim", run = "GlowInstall" }
use {"akinsho/nvim-toggleterm.lua"}
use {"Pocco81/DAPInstall.nvim", opt=true}
use { "akinsho/nvim-toggleterm.lua" }
use { "Pocco81/DAPInstall.nvim", opt = true }
require_plugin("DAPInstall.nvim")
use {
@@ -169,17 +169,17 @@ return require("packer").startup(function(use)
branch = 'v1', -- optional but strongly recommended
config = function()
-- you can configure Hop the way you like here; see :h hop-config
require'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
end
}
-- markdown
use {'godlygeek/tabular'}
use {'preservim/vim-markdown'}
use { 'godlygeek/tabular' }
use { 'preservim/vim-markdown' }
use {
'iamcco/markdown-preview.nvim',
run = function() vim.fn['mkdp#util#install']() end,
ft = {'markdown'}
ft = { 'markdown' }
}
--use 'EdenEast/nightfox.nvim'
@@ -190,24 +190,22 @@ return require("packer").startup(function(use)
-- Extras
if O.extras then
use {'metakirby5/codi.vim', opt = true}
use { 'metakirby5/codi.vim', opt = true }
require_plugin('codi.vim')
--use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install', opt = true}
--require_plugin('markdown-preview.nvim')
use {'numToStr/FTerm.nvim', opt = true}
use { 'numToStr/FTerm.nvim', opt = true }
require_plugin('FTerm.nvim')
use {'nacro90/numb.nvim', opt = true}
use { 'nacro90/numb.nvim', opt = true }
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')
use {'norcalli/nvim-colorizer.lua', opt = true}
use { 'norcalli/nvim-colorizer.lua', opt = true }
require_plugin('nvim-colorizer.lua')
use {'windwp/nvim-spectre', opt = true}
use { 'windwp/nvim-spectre', opt = true }
require_plugin('nvim-spectre')
use {'simrat39/symbols-outline.nvim', opt = true}
require_plugin('symbols-outline.nvim')
use {'nvim-treesitter/playground', opt = true}
use { 'nvim-treesitter/playground', opt = true }
require_plugin('playground')
-- folke/todo-comments.nvim
-- gennaro-tedesco/nvim-jqx