diff --git a/fish/install.sh b/fish/install.sh index 1fd0694..441de71 100755 --- a/fish/install.sh +++ b/fish/install.sh @@ -11,11 +11,8 @@ case "$PM" in sudo add-apt-repository ppa:fish-shell/release-3 -y sudo apt update sudo apt install fish libnotify-bin xdotool silversearcher-ag dash -y - if apt show fzf 2>/dev/null; then - sudo apt install -y fzf - git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf - ~/.fzf/install - fi + git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf + ~/.fzf/install ;; pacman) sudo pacman -S --needed --needed fish xdotool fzf the_silver_searcher dash @@ -52,5 +49,5 @@ lnsf "$DIR/config/functions/fish_right_prompt.fish" "$XDG_CONFIG_HOME/fish/funct lnsf "$DIR/config/functions/fisher.fish" "$XDG_CONFIG_HOME/fish/functions/fisher.fish" # install plugins -fish -c "fisher add jethrokuan/fzf" +#fish -c "fisher add jethrokuan/fzf" diff --git a/nvim/config/init.vim b/nvim/config/init.vim index 428b4fa..e7723bd 100644 --- a/nvim/config/init.vim +++ b/nvim/config/init.vim @@ -21,7 +21,7 @@ set incsearch set signcolumn=yes set laststatus=2 set fillchars=vert:\ ,fold:- -set clipboard=unnamedplus +set clipboard=unnamed,unnamedplus filetype plugin indent on syntax on au! BufWritePost $MYVIMRC source % @@ -86,22 +86,22 @@ if !filereadable(vim_plug_path) echo "vim-plug installed" endif -call plug#begin() +call plug#begin('~/.vim/plugged') Plug 'editorconfig/editorconfig-vim' Plug 'tpope/vim-surround' Plug 'jiangmiao/auto-pairs' Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'posva/vim-vue', { 'for': 'vue' } Plug 'tpope/vim-repeat' -if $COC_ENABLED == 'yes' +if $VIM_MODE == 'enhanced' Plug 'neoclide/coc.nvim', {'branch': 'release'} + Plug 'puremourning/vimspector' else Plug 'Vimjas/vim-python-pep8-indent', { 'for': 'python' } endif Plug 'liuchengxu/eleline.vim' Plug 'tpope/vim-fugitive' " git 功能 Plug 'scrooloose/nerdcommenter' -"Plug 'ctrlpvim/ctrlp.vim' Plug 'mhinz/vim-grepper', { 'on': ['Grepper', '(GrepperOperator)'] } Plug 'morhetz/gruvbox' Plug 'dag/vim-fish', { 'for': 'fish' } @@ -120,8 +120,8 @@ let g:vim_markdown_folding_disabled = 1 let g:closetag_filetypes = 'html,xhtml,phtml,vue' -" ==== coc configuration ==== -if $COC_ENABLED == 'yes' +if $VIM_MODE == 'enhanced' + " ==== coc configuration ==== let g:coc_disable_startup_warning = 1 set statusline^=%{coc#status()} nmap gd (coc-definition) @@ -139,6 +139,10 @@ if $COC_ENABLED == 'yes' nmap cl :CocList nmap sd :call CocAction('doHover') nmap ol (coc-openlink) + + " ==== vimspector configuration ==== + let g:vimspector_enable_mappings = 'HUMAN' + let g:vimspector_install_gadgets = [ 'debugpy' ] endif " ==== auto-pairs configuration ==== diff --git a/nvim/install.sh b/nvim/install.sh index 908803f..29f5e1b 100755 --- a/nvim/install.sh +++ b/nvim/install.sh @@ -22,3 +22,4 @@ esac lnsf "$DIR/config/init.vim" "$XDG_CONFIG_HOME/nvim/init.vim" lnsf "$DIR/config/coc-settings.json" "$XDG_CONFIG_HOME/nvim/coc-settings.json" lnsf "$DIR/config/init.vim" ~/.vimrc +lnsf "$DIR/config/coc-settings.json" ~/.vim/coc-settings.json