From d15b486a6f7dade62d0b1e015e3dcebe694b9c72 Mon Sep 17 00:00:00 2001 From: jay Date: Tue, 13 Jun 2023 13:59:47 +0800 Subject: [PATCH] update --- .../run_once_after_20_install_vim_dep.sh | 3 +- home/dot_config/nvim/init.vim.tmpl | 62 +++++++++---------- home/dot_config/sway/config | 2 +- home/dot_config/waybar/config | 2 +- home/dot_ctags | 13 ++++ home/dot_zprofile.tmpl | 9 +++ 6 files changed, 55 insertions(+), 36 deletions(-) diff --git a/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh b/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh index 4bfb323..11daf3d 100644 --- a/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh +++ b/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh @@ -3,12 +3,11 @@ PATH="$HOME/apps/go/bin:$HOME/apps/node/bin:$PATH" if command -v npm > /dev/null; then - npm i -g typescript typescript-language-server jsctags dockerfile-language-server-nodejs + npm i -g typescript typescript-language-server dockerfile-language-server-nodejs fi if command -v go > /dev/null; then go install github.com/sourcegraph/go-langserver@latest - go install github.com/jstemmer/gotags@latest go install github.com/cweill/gotests/gotests@latest fi diff --git a/home/dot_config/nvim/init.vim.tmpl b/home/dot_config/nvim/init.vim.tmpl index 0afab17..393e232 100644 --- a/home/dot_config/nvim/init.vim.tmpl +++ b/home/dot_config/nvim/init.vim.tmpl @@ -41,9 +41,6 @@ Plug 'easymotion/vim-easymotion' Plug 'mattn/emmet-vim' Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } Plug 'pangloss/vim-javascript' -" tagbar -" golang install go get -u github.com/jstemmer/gotags -Plug 'majutsushi/tagbar' Plug 'w0rp/ale' Plug 'godlygeek/tabular' Plug 'plasticboy/vim-markdown' @@ -79,6 +76,9 @@ Plug 'folke/tokyonight.nvim', { 'branch': 'main' } Plug 'norcalli/nvim-colorizer.lua' +" code outline +Plug 'stevearc/aerial.nvim' + " temp plugin Plug 'tpope/vim-surround' Plug 'buoto/gotests-vim' @@ -185,7 +185,6 @@ command! -bang Tabcloseright call TabCloseRight('') command! -bang Tabcloseleft call TabCloseLeft('') " tagbar -nmap :TagbarToggle nmap :%!jq . " NeoComplete @@ -208,10 +207,14 @@ nmap w (easymotion-overwin-w) " lint let g:ale_linters = { \ 'javascript': ["{{ if .nvim.js_linter }}{{- .nvim.js_linter }}{{ else }}standard{{ end }}"], + \ 'typescript': ["{{ if .nvim.js_linter }}{{- .nvim.js_linter }}{{ else }}standard{{ end }}"], \ 'go': ['gopls'], \ 'rust': ['analyzer'], \} -let g:ale_fixers = {'javascript': ["{{ if .nvim.js_fixer }}{{- .nvim.js_fixer }}{{ else }}standard{{ end }}"]} +let g:ale_fixers = { + \'javascript': ["{{ if .nvim.js_fixer }}{{- .nvim.js_fixer }}{{ else }}standard{{ end }}"], + \'typescript': ["{{ if .nvim.js_fixer }}{{- .nvim.js_fixer }}{{ else }}standard{{ end }}"], + \} let g:ale_linters_explicit = 1 let g:ale_lint_on_save = 1 let g:ale_fix_on_save = 1 @@ -221,33 +224,6 @@ nmap = (ale_fix) let g:NERDSpaceDelims=1 let g:NERDDefaultAlign='left' -let g:tagbar_type_go = { - \ 'ctagstype' : 'go', - \ 'kinds' : [ - \ 'p:package', - \ 'i:imports:1', - \ 'c:constants', - \ 'v:variables', - \ 't:types', - \ 'n:interfaces', - \ 'w:fields', - \ 'e:embedded', - \ 'm:methods', - \ 'r:constructor', - \ 'f:functions' - \ ], - \ 'sro' : '.', - \ 'kind2scope' : { - \ 't' : 'ctype', - \ 'n' : 'ntype' - \ }, - \ 'scope2kind' : { - \ 'ctype' : 't', - \ 'ntype' : 'n' - \ }, - \ 'ctagsbin' : 'gotags', - \ 'ctagsargs' : '-sort -silent' -\ } " copilot setup imap