From 93411a86c57e997b66d5e602a2a8cc45a5cdeda3 Mon Sep 17 00:00:00 2001 From: ksyasuda Date: Sat, 25 Jun 2022 23:35:18 -0700 Subject: [PATCH] update nvim config --- nvim/init.vim | 13 ++++--------- nvim/keybindings.vim | 14 +++++++------- nvim/plugin-confs/lsp-signature.lua | 10 ++++------ nvim/plugin-confs/lspconfig.lua | 4 ++-- nvim/plugin-confs/null-ls.lua | 1 + 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 899be1e..698809b 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -81,14 +81,9 @@ if has('nvim') Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/popup.nvim' Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - " Plug 'zbirenbaum/copilot.lua' - " Plug 'zbirenbaum/copilot-cmp' - " Plug 'nvim-telescope/telescope.nvim' - " Plug 'TimUntersberger/neogit' Plug 'akinsho/bufferline.nvim' Plug 'andweeb/presence.nvim' - Plug 'f-person/git-blame.nvim' Plug 'folke/which-key.nvim' Plug 'glepnir/dashboard-nvim' Plug 'kyazdani42/nvim-tree.lua' @@ -146,7 +141,6 @@ if has('nvim') source ~/.config/nvim/plugin-confs/bufferline.lua source ~/.config/nvim/plugin-confs/dashboard-art.vim source ~/.config/nvim/plugin-confs/dashboard-nvim.lua - source ~/.config/nvim/plugin-confs/git-blame.lua source ~/.config/nvim/plugin-confs/gitsigns.lua source ~/.config/nvim/plugin-confs/lspfuzzy.lua source ~/.config/nvim/plugin-confs/lualine.lua @@ -166,7 +160,7 @@ if has('nvim') source ~/.config/nvim/plugin-confs/nvim-cmp.lua source ~/.config/nvim/plugin-confs/fidget.lua source ~/.config/nvim/plugin-confs/symbols-outline.lua - source ~/.config/nvim/plugin-confs/trouble.lua + " source ~/.config/nvim/plugin-confs/trouble.lua " nvim and vim plugins source ~/.vim/plugin-confs/floaterm.vim @@ -263,9 +257,10 @@ command! -bang -nargs=? -complete=dir Files \ call fzf#vim#files(, fzf#vim#with_preview({'options': ['--layout=reverse', '--info=inline', '--preview', '~/.vim/plugged/fzf.vim/bin/preview.sh']}), 0) command! -bang -nargs=? -complete=dir AllFiles - \ call fzf#run(fzf#wrap('allfiles', fzf#vim#with_preview({'dir': , 'sink': 'e', 'source': 'rg --files --hidden --no-ignore', 'options': ['--layout=reverse', '--preview', '~/.vim/plugged/fzf.vim/bin/preview.sh']}), 0)) + \ call fzf#run(fzf#wrap('allfiles', fzf#vim#with_preview({'dir': , 'sink': 'e', 'source': 'rg --files --hidden --no-ignore', 'options': ['--layout=reverse', '--preview', '~/.vim/plugged/fzf.vim/bin/preview.sh']}), 0)) -command! Lines call fzf#vim#lines(, fzf#vim#with_preview({'options': ['--layout=reverse']}), 0) +command! -bang -nargs=? -complete=dir Lines + \ call fzf#vim#lines(, ({'options': ['--layout=reverse']}), 0) command! -bang -nargs=? -complete=dir Buffers \ call fzf#vim#buffers(, fzf#vim#with_preview({'options': ['--layout=reverse', '--info=inline', '--preview', '~/.vim/plugged/fzf.vim/bin/preview.sh']}), 0) diff --git a/nvim/keybindings.vim b/nvim/keybindings.vim index e9532bd..f8c4b15 100644 --- a/nvim/keybindings.vim +++ b/nvim/keybindings.vim @@ -26,7 +26,7 @@ nmap gDc :lua vim.lsp.buf.declaration() nmap gDf :lua vim.lsp.buf.definition() nmap gF :edit nmap gT :lua vim.lsp.buf.type_definition() -nmap gb :lua vim.lsp.buf.document_symbol() +nmap gb :Gitsigns blame_line " nmap gd :lua vim.lsp.buf.definition() nmap gi :lua vim.lsp.buf.implementation() nmap gl :lua vim.lsp.buf.code_lens() @@ -56,7 +56,7 @@ nmap fa :DashboardFindWord nmap fb :DashboardJumpMark nmap fh :DashboardFindHistory -nmap gb :GitBlameToggle +nmap gb :Gitsigns blame_line nmap gc :Commits nmap gf :GitFiles " nmap gg :Neogit @@ -123,11 +123,11 @@ nmap wa :lua vim.lsp.buf.add_workspace_folder() nmap wl :lua print(vim.inspect(vim.lsp.buf.list_workspace_folders())) nmap wr :lua vim.lsp.buf.remove_workspace_folder() -nnoremap xd TroubleToggle document_diagnostics -nnoremap xl TroubleToggle loclist -nnoremap xq TroubleToggle quickfix -nnoremap xw TroubleToggle workspace_diagnostics -nnoremap xx TroubleToggle +" nnoremap xd TroubleToggle document_diagnostics +" nnoremap xl TroubleToggle loclist +" nnoremap xq TroubleToggle quickfix +" nnoremap xw TroubleToggle workspace_diagnostics +" nnoremap xx TroubleToggle nmap y "+ vmap y "+ diff --git a/nvim/plugin-confs/lsp-signature.lua b/nvim/plugin-confs/lsp-signature.lua index afb7bb4..899f9e7 100644 --- a/nvim/plugin-confs/lsp-signature.lua +++ b/nvim/plugin-confs/lsp-signature.lua @@ -6,29 +6,27 @@ cfg = { bind = true, -- This is mandatory, otherwise border config won't get registered. -- If you want to hook lspsaga or other signature handler, pls set to false - doc_lines = 10, -- will show two lines of comment/doc(if there are more than two lines in doc, will be truncated); + doc_lines = 12, -- will show two lines of comment/doc(if there are more than two lines in doc, will be truncated); -- set to 0 if you DO NOT want any API comments be shown -- This setting only take effect in insert mode, it does not affect signature help in normal -- mode, 10 by default floating_window = true, -- show hint in a floating window, set to false for virtual text only mode - floating_window_above_cur_line = true, -- try to place the floating above the current line when possible Note: -- will set to true when fully tested, set to false will use whichever side has more space -- this setting will be helpful if you do not want the PUM and floating win overlap floating_window_off_x = 1, -- adjust float windows x position. - floating_window_off_y = 1, -- adjust float windows y position. - + floating_window_off_y = -1, -- adjust float windows y position. fix_pos = false, -- set to true, the floating window will not auto-close until finish all parameters hint_enable = true, -- virtual hint enable hint_prefix = " ", -- Panda for parameter hint_scheme = "String", hi_parameter = "LspSignatureActiveParameter", -- how your parameter will be highlight - max_height = 12, -- max height of signature floating_window, if content is more than max_height, you can scroll down + max_height = 15, -- max height of signature floating_window, if content is more than max_height, you can scroll down -- to view the hiding contents - max_width = 40, -- max_width of signature floating_window, line will be wrapped if exceed max_width + max_width = 85, -- max_width of signature floating_window, line will be wrapped if exceed max_width handler_opts = { border = "rounded" -- double, rounded, single, shadow, none }, diff --git a/nvim/plugin-confs/lspconfig.lua b/nvim/plugin-confs/lspconfig.lua index 50ed11c..25735c6 100644 --- a/nvim/plugin-confs/lspconfig.lua +++ b/nvim/plugin-confs/lspconfig.lua @@ -185,7 +185,7 @@ lsp_installer.on_server_ready(function(server) end) -local servers = { 'jedi_language_server', 'bashls', 'vimls', 'yamlls', 'dockerls', 'html', 'sumneko_lua', 'rust_analyzer', 'clangd', 'ansiblels' } +local servers = { 'jedi_language_server', 'bashls', 'vimls', 'yamlls', 'dockerls', 'sumneko_lua', 'rust_analyzer', 'clangd', 'ansiblels' } for _, lsp in pairs(servers) do require('lspconfig')[lsp].setup { on_attach = on_attach, @@ -196,4 +196,4 @@ for _, lsp in pairs(servers) do } end -require 'lspconfig'.bashls.setup {} +-- require 'lspconfig'.bashls.setup {} diff --git a/nvim/plugin-confs/null-ls.lua b/nvim/plugin-confs/null-ls.lua index 9bb897b..ff9843c 100644 --- a/nvim/plugin-confs/null-ls.lua +++ b/nvim/plugin-confs/null-ls.lua @@ -43,6 +43,7 @@ require("null-ls").setup({ }), null_ls.builtins.formatting.black, null_ls.builtins.formatting.isort, + -- null_ls.builtins.formatting.tidy }, })