From 218ed007aac809810968689448e8e3b03cd03fbb Mon Sep 17 00:00:00 2001 From: prozhou Date: Fri, 27 Sep 2019 16:13:09 +0800 Subject: [PATCH 01/21] bug fix --- tools/neovim/ubuntu_init.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 583b21b..e54f70c 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -220,7 +220,7 @@ cat >> ~/.config/nvim/init.vim <rn (coc-rename) END -if [ "Y$OPT_NO_DEFX_ICON" == "Yyes" ];then ! (grep -F 'kristijanhusak/defx-icons' ~/.config/nvim/init.vim &>/dev/null ) && \ sed -i "/plug#begin/aPlug 'kristijanhusak/defx-icons'" ~/.config/nvim/init.vim && \ sed -i "/plug#begin/aPlug 'kristijanhusak/defx-git'" ~/.config/nvim/init.vim @@ -373,5 +372,4 @@ cat >> ~/.config/nvim/init.vim < Date: Fri, 27 Sep 2019 16:15:35 +0800 Subject: [PATCH 02/21] bug fix --- tools/neovim/ubuntu_init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index e54f70c..7aafe8b 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -342,7 +342,7 @@ END sed -i "/plug#begin/aPlug 'kristijanhusak/defx-icons'" ~/.config/nvim/init.vim && \ sed -i "/plug#begin/aPlug 'kristijanhusak/defx-git'" ~/.config/nvim/init.vim -! (grep -F 'Defx_mappings' ~/.config/nvim/init.vim &>/dev/null ) && \ +! (grep -F 'call s:setup_defx' ~/.config/nvim/init.vim &>/dev/null ) && \ sed -i "/Defx_mappings/a autocmd VimEnter * call s:setup_defx()" ~/.config/nvim/init.vim From c156f5323ee56927000992d32cdf790e14eb1a1e Mon Sep 17 00:00:00 2001 From: prozhou Date: Sun, 6 Oct 2019 01:38:45 +0000 Subject: [PATCH 03/21] add vims --- helper/option.sh | 2 ++ tools/dep/ubuntu_init.sh | 3 +++ tools/neovim/ubuntu_init.sh | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/helper/option.sh b/helper/option.sh index 9967029..f4afc65 100644 --- a/helper/option.sh +++ b/helper/option.sh @@ -8,6 +8,7 @@ OPT_LEETCODE= OPT_MAN= OPT_DICT= OPT_BASH= +OPT_VIM= OPT_FE= OPT_NO_DEFX_ICON= @@ -26,5 +27,6 @@ do --with_bash) OPT_BASH=yes ;; --with_fe) OPT_FE=yes ;; --without_defx_icon) OPT_NO_DEFX_ICON=yes ;; + --with_vim) OPT_VIM=yes ;; esac done diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index aa7cdbd..600a4d2 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -62,6 +62,9 @@ fi if [ "Y$OPT_PYTHON" == "Yyes" ];then sudo pip3 install jedi fi +if [ "Y$OPT_VIM" == "Yyes" ];then + yarn global add vim-language-server +fi if [ "Y$OPT_LUA" == "Yyes" ];then apt install -y lua5.3-dev luarocks lua5.3 diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 7aafe8b..165e991 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -48,7 +48,7 @@ function lua_ins(){ function bash_ins(){ ! ( grep -F "languageserver" ~/.config/nvim/coc-settings.json ) && \ - sed -i '/suggest.timeout/i "languageserver": {\n"bash": {\n"command": "bash-language-server",\n"args": ["start"],\n"filetypes": ["sh"]",ignoredRootPaths": ["~"]\n}\n},' ~/.config/nvim/coc-settings.json + sed -i '/suggest.timeout/i "languageserver": {\n"bash": {\n"command": "bash-language-server",\n"args": ["start"],\n"filetypes": ["sh"],"ignoredRootPaths": ["~"]\n}\n},' ~/.config/nvim/coc-settings.json } function fe_ins(){ @@ -195,6 +195,10 @@ if [ "Y$OPT_PYTHON" == "Yyes" ];then nvim "+CocInstall -sync coc-python" +qall fi +if [ "Y$OPT_VIM" == "Yyes" ];then + nvim "+CocInstall -sync coc-vimlsp" +qall +fi + ! which ctags >/dev/null && \ git clone https://github.com/universal-ctags/ctags.git &&\ cd ctags && ./autogen.sh && ./configure && make && make install &&\ From dcf749b0e6b19fc66b73569e95714e898a709a4b Mon Sep 17 00:00:00 2001 From: prozhou Date: Thu, 24 Oct 2019 23:31:07 +0800 Subject: [PATCH 04/21] vim-go --- tools/neovim/ubuntu_init.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 165e991..8cfadbe 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -58,10 +58,7 @@ function fe_ins(){ function go_ins(){ ! (grep -F 'sebdah/vim-delve' ~/.config/nvim/init.vim &>/dev/null ) && \ sed -i "/plug#begin/aPlug 'sebdah/vim-delve'" ~/.config/nvim/init.vim - if which go;then - pxy go get -u github.com/derekparker/delve/cmd/dlv - pxy go get -u golang.org/x/tools/cmd/gopls - fi + sed -i "/plug#begin/aPlug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }" ~/.config/nvim/init.vim ! ( grep -F "languageserver" ~/.config/nvim/coc-settings.json ) && \ sed -i '/suggest.timeout/i "languageserver": {\n"golang": {\n"command": "gopls",\n"filetypes": ["go"]\n}\n},' ~/.config/nvim/coc-settings.json @@ -330,7 +327,15 @@ nmap gi (coc-implementation) nmap gr (coc-references) " Use K to show documentation in preview window -nnoremap K :call show_documentation() +nnoremap U :call show_documentation() + +" Use to trigger completion. +inoremap

coc#refresh() + +" disable vim-go :GoDef short cut (gd) +" this is handled by LanguageClient [LC] + +let g:go_def_mapping_enabled = 0 function! s:show_documentation() if (index(['vim','help'], &filetype) >= 0) From d897e0cfd2335be84062a9d206744e0d0c57a1ed Mon Sep 17 00:00:00 2001 From: prozhou Date: Fri, 25 Oct 2019 13:02:25 +0800 Subject: [PATCH 05/21] inc timeout --- tools/neovim/coc-settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/neovim/coc-settings.json b/tools/neovim/coc-settings.json index cbe8c23..36c2a27 100644 --- a/tools/neovim/coc-settings.json +++ b/tools/neovim/coc-settings.json @@ -1,7 +1,7 @@ { "suggest.triggerAfterInsertEnter": true, "suggest.noselect": false, - "suggest.timeout": 500, + "suggest.timeout": 3500, "suggest.minTriggerInputLength": 2, "suggest.echodocSupport": true, "suggest.enablePreview": false From bbb610145c5c7c135059e89e7c832c9165c6a92e Mon Sep 17 00:00:00 2001 From: prozhou Date: Mon, 28 Oct 2019 01:26:35 +0000 Subject: [PATCH 06/21] pxy goinstall --- tools/neovim/ubuntu_init.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 8cfadbe..848c12f 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -58,8 +58,9 @@ function fe_ins(){ function go_ins(){ ! (grep -F 'sebdah/vim-delve' ~/.config/nvim/init.vim &>/dev/null ) && \ sed -i "/plug#begin/aPlug 'sebdah/vim-delve'" ~/.config/nvim/init.vim - sed -i "/plug#begin/aPlug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }" ~/.config/nvim/init.vim + sed -i "/plug#begin/aPlug 'fatih/vim-go'" ~/.config/nvim/init.vim + pxy nvim +'GoInstallBinaries' +qall ! ( grep -F "languageserver" ~/.config/nvim/coc-settings.json ) && \ sed -i '/suggest.timeout/i "languageserver": {\n"golang": {\n"command": "gopls",\n"filetypes": ["go"]\n}\n},' ~/.config/nvim/coc-settings.json ! ( grep -F "leetcode_solution_filetype" ~/.config/nvim/init.vim ) && \ From 3e0fc9a18b5ab582a9f1a477a5a339d3bb77ec4f Mon Sep 17 00:00:00 2001 From: prozhou Date: Sun, 3 Nov 2019 14:47:48 +0800 Subject: [PATCH 07/21] python --- tools/neovim/ubuntu_init.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 8cfadbe..912b365 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -32,6 +32,7 @@ END function python_ins(){ ! ( grep -F "python.linting.enabled" ~/.config/nvim/coc-settings.json ) && \ sed -i '/suggest.timeout/i "python.linting.enabled": false,' ~/.config/nvim/coc-settings.json + sed -i '/suggest.timeout/i "python.jediEnabled": false,' ~/.config/nvim/coc-settings.json } function java_ins(){ From be4289176d0cfe260bfe3c643da4e70809ae31b2 Mon Sep 17 00:00:00 2001 From: prozhou Date: Fri, 20 Dec 2019 17:08:46 +0800 Subject: [PATCH 08/21] leetcode change --- tools/dep/ubuntu_init.sh | 2 +- tools/neovim/ubuntu_init.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 600a4d2..05ca0f6 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -4,7 +4,7 @@ apt-get install -y gawk curl zsh language-pack-zh-hans language-pack-zh-hans-ba git unzip wget python-dev python3-pip python-pip lsof \ libtool-bin gettext sudo \ cmake automake m4 autoconf libtool build-essential pkg-config wamerican \ - autojump nmap iproute2 net-tools sshfs axel + autojump nmap iproute2 net-tools sshfs axel netcat apt-get remove -y neovim exuberant-ctags npm install -g yarn if [ "Y$OPT_MAN" == "Yyes" ];then diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index e73eca0..35cde1f 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -18,14 +18,13 @@ END function leetcode_ins(){ ! (grep -F 'ianding1/leetcode' ~/.config/nvim/init.vim &>/dev/null ) && \ pip3 install requests beautifulsoup4 && \ - sed -i "/plug#begin/aPlug 'ianding1/leetcode.vim'" ~/.config/nvim/init.vim + sed -i "/plug#begin/aPlug 'zhoupro/leetcode.vim', { 'do': 'pip3 install -r requirements.txt' }" ~/.config/nvim/init.vim ! ( grep -F "LeetCodeList" ~/.config/nvim/init.vim ) && \ cat >> ~/.config/nvim/init.vim <ll :LeetCodeList nnoremap lt :LeetCodeTest nnoremap ls :LeetCodeSubmit - nnoremap li :LeetCodeSignIn END } From 463bc2dc9ad1e54146c6bfff57c80ffed6dd01bd Mon Sep 17 00:00:00 2001 From: prozhou Date: Mon, 20 Jan 2020 11:00:26 +0800 Subject: [PATCH 09/21] gopkgs --- tools/dep/ubuntu_init.sh | 8 ++++++++ tools/neovim/ubuntu_init.sh | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 05ca0f6..5b3af23 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -66,6 +66,14 @@ if [ "Y$OPT_VIM" == "Yyes" ];then yarn global add vim-language-server fi +if [ "Y$OPT_GO" == "Yyes" ];then + + if [ ! -f /usr/local/bin/gopkgs ];then + wget https://github.com/haya14busa/gopkgs/releases/download/v1.0.0/gopkgs_linux_amd64 && mv gopkgs_linux_amd64 /usr/local/bin/gopkgs && chmod u+x /usr/local/bin/gopkgs + fi + +fi + if [ "Y$OPT_LUA" == "Yyes" ];then apt install -y lua5.3-dev luarocks lua5.3 luarocks install --server=http://luarocks.org/dev lua-lsp diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 35cde1f..d672eec 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -16,15 +16,38 @@ END } function leetcode_ins(){ - ! (grep -F 'ianding1/leetcode' ~/.config/nvim/init.vim &>/dev/null ) && \ + ! (grep -F 'zhoupro/leetcode' ~/.config/nvim/init.vim &>/dev/null ) && \ pip3 install requests beautifulsoup4 && \ sed -i "/plug#begin/aPlug 'zhoupro/leetcode.vim', { 'do': 'pip3 install -r requirements.txt' }" ~/.config/nvim/init.vim ! ( grep -F "LeetCodeList" ~/.config/nvim/init.vim ) && \ cat >> ~/.config/nvim/init.vim <ll :LeetCodeList nnoremap lt :LeetCodeTest nnoremap ls :LeetCodeSubmit + + function! s:get_go_pkgs() + function! s:go_import(pk) + execute 'GoImport' a:pk + endfunction + call fzf#run(fzf#wrap({'source': 'gopkgs | sort | uniq', 'sink': function('s:go_import')})) + endfunction + + function! s:get_go_doc() + function! s:go_doc(pk) + execute 'GoDoc' a:pk + endfunction + call fzf#run(fzf#wrap({'source': 'gopkgs | sort | uniq', 'sink': function('s:go_doc')})) + endfunction + augroup gopkgs + autocmd! + autocmd FileType go command! -buffer GI exe s:get_go_pkgs() + autocmd FileType go command! -buffer GD exe s:get_go_doc() + augroup END + + map i :GI + map d :GD END } From 7bce168746214115cf096143b1b8deefa244bead Mon Sep 17 00:00:00 2001 From: prozhou Date: Mon, 20 Jan 2020 03:53:18 +0000 Subject: [PATCH 10/21] add lazygit --- tools/dep/ubuntu_init.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 5b3af23..305e4fa 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -7,6 +7,11 @@ apt-get install -y gawk curl zsh language-pack-zh-hans language-pack-zh-hans-ba autojump nmap iproute2 net-tools sshfs axel netcat apt-get remove -y neovim exuberant-ctags npm install -g yarn + +#install lazygit +if [ ! -f /usr/local/bin/lazygit ]; then + wget https://github.com/jesseduffield/lazygit/releases/download/v0.13/lazygit_0.13_Linux_x86_64.tar.gz && tar xzvf lazygit_0.13_Linux_x86_64.tar.gz && mv lazygit /usr/local/bin/ && chmod u+x /usr/local/bin/lazygit +fi if [ "Y$OPT_MAN" == "Yyes" ];then [ -f /etc/dpkg/dpkg.cfg.d/excludes ] && rm -rf /etc/dpkg/dpkg.cfg.d/excludes apt-get install -y \ From 5c2b6bc79aeb741dd125aedcb149665b4861d6ec Mon Sep 17 00:00:00 2001 From: zhoupro Date: Sun, 5 Jul 2020 22:13:21 +0800 Subject: [PATCH 11/21] for ubuntu20.04 --- README.md | 2 +- init.sh | 18 ++++++++----- tools/dep/ubuntu_init.sh | 54 +++++++++++++++++-------------------- tools/neovim/init.vim | 4 ++- tools/neovim/ubuntu_init.sh | 41 +++++++++++++--------------- tools/pxy/pxy.sh | 12 ++++----- tools/tmux/ubuntu_init.sh | 5 ---- tools/zsh/ubuntu_init.sh | 19 ++++++------- 8 files changed, 72 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index 6249028..bf75522 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # cli develop env ### os -* ubuntu +* ubuntu20.04 ### language - php - c/c++ diff --git a/init.sh b/init.sh index 454c167..08a580d 100755 --- a/init.sh +++ b/init.sh @@ -10,16 +10,20 @@ source "./helper/installer.sh" source "./helper/option.sh" ins dep ins pxy + +if [ "Y$OPT_JAVA" == "Yyes" ];then + ins jdk +fi + + +# main tools start +ins tmux ins zsh -ins hyper ins neovim -ins tmux +#main tools end +ins hyper ins karabiner ins ssh -ins clipper ins phoenix -if [ "Y$OPT_JAVA" == "Yyes" ];then - ins jdk -fi -zsh +ins clipper # vim: set ts=4 sw=4 tw=0 et : diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 305e4fa..964c407 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -1,33 +1,26 @@ #!/bin/bash -apt-get install -y gawk curl zsh language-pack-zh-hans language-pack-zh-hans-base \ - git unzip wget python-dev python3-pip python-pip lsof \ - libtool-bin gettext sudo \ - cmake automake m4 autoconf libtool build-essential pkg-config wamerican \ - autojump nmap iproute2 net-tools sshfs axel netcat +apt-get install -y gawk curl zsh \ + git unzip wget python3-pip lsof sudo \ + autojump nmap iproute2 net-tools axel netcat ripgrep + + #clibtool-bin gettext make automake m4 autoconf libtool build-essential pkg-config wamerican \ + + apt-get remove -y neovim exuberant-ctags -npm install -g yarn + + #install lazygit -if [ ! -f /usr/local/bin/lazygit ]; then - wget https://github.com/jesseduffield/lazygit/releases/download/v0.13/lazygit_0.13_Linux_x86_64.tar.gz && tar xzvf lazygit_0.13_Linux_x86_64.tar.gz && mv lazygit /usr/local/bin/ && chmod u+x /usr/local/bin/lazygit -fi +#if [ ! -f /usr/local/bin/lazygit ]; then +# wget https://github.com/jesseduffield/lazygit/releases/download/v0.13/lazygit_0.13_Linux_x86_64.tar.gz && tar xzvf lazygit_0.13_Linux_x86_64.tar.gz && mv lazygit /usr/local/bin/ && chmod u+x /usr/local/bin/lazygit +#fi + if [ "Y$OPT_MAN" == "Yyes" ];then [ -f /etc/dpkg/dpkg.cfg.d/excludes ] && rm -rf /etc/dpkg/dpkg.cfg.d/excludes apt-get install -y \ cppman man manpages manpages-dev manpages-posix manpages-posix-dev fi -if [ "Y$OPT_DICT" == "Yyes" ];then - apt-get install -y sdcv - if [ ! -d /usr/share/stardict/dict/stardict-oxford-gb-2.4.2 ];then - mkdir -p /usr/share/stardict/dic/ && \ - wget http://download.huzheng.org/zh_CN/stardict-oxford-gb-2.4.2.tar.bz2 && \ - wget http://download.huzheng.org/zh_CN/stardict-wubi86-2.4.2.tar.bz2 && \ - tar -xjvf stardict-wubi86-2.4.2.tar.bz2 -C /usr/share/stardict/dic && \ - tar -xjvf stardict-oxford-gb-2.4.2.tar.bz2 -C /usr/share/stardict/dic && \ - rm -rf stardict-* - fi -fi #install clangd8 url:https://apt.llvm.org/ if [ "Y$OPT_CPP" == "Yyes" ];then @@ -47,27 +40,32 @@ END wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - &&\ apt update && apt install -y clang-tools-8 &&\ sudo update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-8 100 -fi -if [ "Y$OPT_CPP" == "Yyes" ];then apt-get install -y \ valgrind clang-format cscope gdb fi + if [ "Y$OPT_BASH" == "Yyes" ];then apt-get install -y \ shellcheck if ! which bash-language-server > /dev/null; then - sudo npm i -g bash-language-server --unsafe-perm + npm i -g bash-language-server --unsafe-perm fi fi + if [ "Y$OPT_PHP" == "Yyes" ];then - sudo npm i -g intelephense + npm i -g intelephense fi + if [ "Y$OPT_PYTHON" == "Yyes" ];then - sudo pip3 install jedi + pip3 install jedi fi + if [ "Y$OPT_VIM" == "Yyes" ];then + + apt install -y npm + npm install -g yarn yarn global add vim-language-server fi @@ -83,10 +81,12 @@ if [ "Y$OPT_LUA" == "Yyes" ];then apt install -y lua5.3-dev luarocks lua5.3 luarocks install --server=http://luarocks.org/dev lua-lsp fi + if [ "Y$OPT_FE" == "Yyes" ];then sudo npm install -g typescript typescript-language-server sudo npm install -g vscode-css-languageserver-bin fi + if [ "Y$OPT_JAVA" == "Yyes" ];then OLD_DIR=`pwd` if [ ! -d ~/.config/coc/extensions/coc-java-data/server/config_linux ];then @@ -107,7 +107,3 @@ if [ "Y$OPT_JAVA" == "Yyes" ];then fi fi -# install ripgrep -! which rg && \ - curl -LO https://github.com/BurntSushi/ripgrep/releases/download/0.10.0/ripgrep_0.10.0_amd64.deb && \ - sudo dpkg -i ripgrep_0.10.0_amd64.deb && rm -rf ripgrep_0.10.0_amd64.deb diff --git a/tools/neovim/init.vim b/tools/neovim/init.vim index 5c92f38..e825860 100755 --- a/tools/neovim/init.vim +++ b/tools/neovim/init.vim @@ -22,7 +22,9 @@ call plug#begin('~/.local/share/nvim/plugged') "git Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' - Plug 'gregsexton/gitv' + " + " + "Plug 'gregsexton/gitv' " transform Plug 'tpope/vim-abolish' Plug 'tpope/vim-surround' diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index d672eec..3852926 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -124,31 +124,35 @@ if [ ! -f /usr/local/bin/vim ];then sudo ln -s ~/opt/soft/nvim/squashfs-root/usr/bin/nvim /usr/local/bin/nvim rm -rf nvim.appimage fi -pip3 install neovim --upgrade -pip2 install neovim --upgrade + +if [ ! "$(pip3 list | grep neovim)" ];then + pip3 install neovim --upgrade +fi #------------------------------------------------------------------------------- # install vim-plug #------------------------------------------------------------------------------- if [ ! -f ~/.local/share/nvim/site/autoload/plug.vim ] ; then - curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \ + pxy curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim fi #------------------------------------------------------------------------------- # copy init.vim to home dir, and install from command line #------------------------------------------------------------------------------- -if [ ! -f ~/.vim/c_cnt.sh ] ; then - mkdir -p ~/.config/nvim - cp tools/neovim/c_cnt.sh ~/.config/nvim/c_cnt.sh - cp tools/neovim/add_swap.sh ~/.config/nvim/add_swap.sh - cp tools/neovim/del_swap.sh ~/.config/nvim/del_swap.sh -fi +# if [ ! -f ~/.vim/c_cnt.sh ] ; then +# mkdir -p ~/.config/nvim +# cp tools/neovim/c_cnt.sh ~/.config/nvim/c_cnt.sh +# cp tools/neovim/add_swap.sh ~/.config/nvim/add_swap.sh +# cp tools/neovim/del_swap.sh ~/.config/nvim/del_swap.sh +# fi + rm -f ~/.config/nvim/init.vim #common config mkdir -p ~/.config/nvim cp tools/neovim/init.vim ~/.config/nvim/init.vim cp tools/neovim/coc-settings.json ~/.config/nvim/coc-settings.json + # copy if nmap localhost -p 8377 | grep open 2>/dev/null;then sed -in 's#NCHOST#localhost#g' ~/.config/nvim/init.vim @@ -232,11 +236,11 @@ fi cat tools/neovim/cfg.ini >> ~/.config/nvim/init.vim ! ( grep -F "cus_ini_env" ~/.env ) && \ cat tools/neovim/env.ini >> ~/.env -[ ! -f /usr/local/bin/genUrl ] &&\ - cp tools/neovim/genUrl.sh /usr/local/bin/genUrl && chmod u+x /usr/local/bin/genUrl -[ ! -d /usr/local/vimsplain ] &&\ - git clone https://github.com/pafcu/vimsplain.git /usr/local/vimsplain -rm -rf ~/.gdbinit && cp tools/neovim/gdbinit ~/.gdbinit +# [ ! -f /usr/local/bin/genUrl ] &&\ +# cp tools/neovim/genUrl.sh /usr/local/bin/genUrl && chmod u+x /usr/local/bin/genUrl +# [ ! -d /usr/local/vimsplain ] &&\ +# git clone https://github.com/pafcu/vimsplain.git /usr/local/vimsplain +#rm -rf ~/.gdbinit && cp tools/neovim/gdbinit ~/.gdbinit ! ( grep -F "defx_my_settings" ~/.config/nvim/init.vim ) && \ @@ -313,15 +317,6 @@ function! s:defx_my_settings() abort endfunction END -if [ "Y$OPT_DICT" == "Yyes" ];then - ! ( grep -F "QuerySel" ~/.config/nvim/init.vim ) && \ - cat >> ~/.config/nvim/init.vim <w :call QuerySel() -END -fi #coc setting ! ( grep -F "show_documentation" ~/.config/nvim/init.vim ) && \ diff --git a/tools/pxy/pxy.sh b/tools/pxy/pxy.sh index 3bcc787..c00ec38 100755 --- a/tools/pxy/pxy.sh +++ b/tools/pxy/pxy.sh @@ -2,13 +2,13 @@ export http_proxy="" export https_proxy="" -if nmap localhost -p 8787 | grep open >/dev/null;then - export http_proxy=http://localhost:8787 - export https_proxy=http://localhost:8787 -elif nmap host.docker.internal -p 8787 | grep open >/dev/null;then +if nmap localhost -p 39571 | grep open >/dev/null;then + export http_proxy=http://localhost:39571 + export https_proxy=http://localhost:39571 +elif nmap host.docker.internal -p 39571 | grep open >/dev/null;then ip=$(/sbin/ip route|awk '/default/ { print $3 }') - export http_proxy=http://$ip:8787 - export https_proxy=http://$ip:8787 + export http_proxy=http://$ip:39571 + export https_proxy=http://$ip:39571 elif nmap localhost -p 8087 | grep open >/dev/null;then export http_proxy=http://localhost:8087 export https_proxy=http://localhost:8087 diff --git a/tools/tmux/ubuntu_init.sh b/tools/tmux/ubuntu_init.sh index 9d1a266..4f9a417 100755 --- a/tools/tmux/ubuntu_init.sh +++ b/tools/tmux/ubuntu_init.sh @@ -2,8 +2,3 @@ ! which tmux &&\ apt-get install tmux -y -rm -f ~/.tmux.conf ~/.tmux.conf.local -cp tools/tmux/tmux.conf ~/.tmux.conf -cp tools/tmux/tmux.conf.local ~/.tmux.conf.local -echo 'alias tmux="tmux -2"' >> "$HOME/.env" -echo 'export TERM=xterm-256color' >> "$HOME/.env" diff --git a/tools/zsh/ubuntu_init.sh b/tools/zsh/ubuntu_init.sh index 9ab998a..4dd9f1d 100755 --- a/tools/zsh/ubuntu_init.sh +++ b/tools/zsh/ubuntu_init.sh @@ -4,17 +4,22 @@ # CREATED: 2018/03/24 18时08分31秒 #=============================================================================== -set -o nounset # Treat unset variables as an error -sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -| sed 's/env zsh -l//g')" +if [ -d ~/.oh-my-zsh ];then + return +fi + +sh -c "$(pxy wget --no-check-certificate https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -| sed 's/env zsh -l//g')" if [ ! -d "$HOME/.zplug" ];then git clone https://github.com/zplug/zplug.git ~/.zplug sudo usermod -s /bin/zsh root fi + ! (grep -F 'zsh-autosuggestions' ~/.zshrc &>/dev/null ) && \ git clone https://github.com/zsh-users/zsh-autosuggestions "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" && \ sed -E -i "s/plugins=$(.*)$/plugins=$\1 zsh-autosuggestions$/g" ~/.zshrc + ! (grep -F 'LC_ALL' ~/.env &>/dev/null ) && \ echo 'export LC_ALL=zh_CN.UTF-8' >> "$HOME/.env" && \ echo 'export LANG=zh_CN.UTF-8' >> "$HOME/.env" && \ @@ -52,11 +57,6 @@ END ! (grep -F '.env' ~/.zshrc &>/dev/null ) && \ echo 'if [ -f ~/.env ];then; source ~/.env;fi' >> ~/.zshrc -#themes -! (grep -F 'avit' ~/.zshrc &>/dev/null ) && \ - sed -i 's#ZSH_THEME="robbyrussell"#ZSH_THEME="avit"#g' ~/.zshrc - - ! (grep -F 'history-incremental-search-backward' ~/.cus_zshrc &>/dev/null ) && \ cat >> ~/.cus_zshrc </dev/null ) && \ -sed -i "/if.*n.*me.*then/i ip=\`ifconfig | grep 'inet ' | grep -v 127.0.0.1 | awk '{print \$2}'\`" ~/.oh-my-zsh/themes/avit.zsh-theme && \ -sed -i '/if.*n.*me.*then/i me="%n@$ip"' ~/.oh-my-zsh/themes/avit.zsh-theme + From 8609ae9688201225e8d2c4fab4b791531d5787fc Mon Sep 17 00:00:00 2001 From: zhoupro Date: Mon, 6 Jul 2020 11:36:46 +0800 Subject: [PATCH 12/21] add sql language server --- tools/neovim/config.yml | 4 ++++ tools/neovim/ubuntu_init.sh | 43 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 tools/neovim/config.yml diff --git a/tools/neovim/config.yml b/tools/neovim/config.yml new file mode 100644 index 0000000..9e40b21 --- /dev/null +++ b/tools/neovim/config.yml @@ -0,0 +1,4 @@ +connections: + - alias: dsn_mysql + 'driver': 'mysql' + 'dataSourceName': 'root:zsz123@tcp(127.0.0.1:3306)/mysql' diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 3852926..637892d 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -15,6 +15,47 @@ END } +function sql_ins(){ + + rm ~/.config/sqls -rf && \ + mkdir -p ~/.config/sqls/ && \ + cp tools/neovim/config.yml ~/.config/sqls/ + + ! (grep -F 'lighttiger2505/sqls.vim' ~/.config/nvim/init.vim &>/dev/null ) && \ + sed -i "/plug#begin/aPlug 'lighttiger2505/sqls.vim'" ~/.config/nvim/init.vim && \ + sed -i "/plug#begin/aPlug 'prabirshrestha/vim-lsp'" ~/.config/nvim/init.vim && \ + sed -i "/plug#begin/aPlug 'prabirshrestha/async.vim'" ~/.config/nvim/init.vim + + ! ( grep -F "config.yml" ~/.config/nvim/coc-settings.json ) && \ + sed -i '/languageserver/a "sql": {\n"command": "sqls",\n"args":["-config", "/root/.config/sqls/config.yml"],\n"filetypes": ["sql"]\n},' ~/.config/nvim/coc-settings.json + + ! ( grep -F "LspSqls" ~/.config/nvim/init.vim ) && \ +cat >> ~/.config/nvim/init.vim <['sqls']}, + \ 'whitelist': ['sql'], + \ 'workspace_config': { + \ 'sqls': { + \ 'connections': [ + \ { + \ 'driver': 'mysql', + \ 'dataSourceName': 'root:zsz123@tcp(127.0.0.1:3306)/test', + \ }, + \ ], + \ }, + \ }, + \ }) + augroup END +endif +END + +} + + function leetcode_ins(){ ! (grep -F 'zhoupro/leetcode' ~/.config/nvim/init.vim &>/dev/null ) && \ pip3 install requests beautifulsoup4 && \ @@ -168,8 +209,10 @@ fi #language + if [ "Y$OPT_GO" == "Yyes" ];then go_ins + sql_ins fi if [ "Y$OPT_PHP" == "Yyes" ];then From 4490cfaf09bb4e5f3175fb4603ea6d4e2d3eb7a6 Mon Sep 17 00:00:00 2001 From: zhoupro Date: Mon, 6 Jul 2020 12:33:27 +0800 Subject: [PATCH 13/21] clangd language server --- tools/dep/ubuntu_init.sh | 19 +------------------ tools/neovim/coc-settings.json | 7 +++++++ tools/neovim/ubuntu_init.sh | 16 ++++++++-------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 964c407..1f502cc 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -24,25 +24,8 @@ fi #install clangd8 url:https://apt.llvm.org/ if [ "Y$OPT_CPP" == "Yyes" ];then - ! ( grep -F "llvm-toolchain-" /etc/apt/sources.list ) && \ - cat >> /etc/apt/sources.list <> ~/.config/nvim/init.vim <> ~/.config/nvim/init.vim < Date: Mon, 6 Jul 2020 17:33:30 +0800 Subject: [PATCH 14/21] java language server --- tools/dep/ubuntu_init.sh | 39 +++++++++++++++++++------------------ tools/jdk/init.sh | 5 ++++- tools/neovim/ubuntu_init.sh | 5 +---- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 1f502cc..b25120e 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -70,23 +70,24 @@ if [ "Y$OPT_FE" == "Yyes" ];then sudo npm install -g vscode-css-languageserver-bin fi -if [ "Y$OPT_JAVA" == "Yyes" ];then - OLD_DIR=`pwd` - if [ ! -d ~/.config/coc/extensions/coc-java-data/server/config_linux ];then - mkdir -p ~/.config/coc/extensions/coc-java-data/server && \ - cd ~/.config/coc/extensions/coc-java-data/server && \ - axel https://download.eclipse.org/jdtls/milestones/0.35.0/jdt-language-server-0.35.0-201903142358.tar.gz && \ - tar xf jdt-language-server-0.35.0-201903142358.tar.gz && rm jdt-language-server*.tar.gz - fi - cd $OLD_DIR - if [ ! -d /opt/apache-maven-3.6.1 ];then - # install maven - cd /opt && \ - wget http://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz && \ - tar xf apache-maven-3.6.1-bin.tar.gz && \ - export PATH=/opt/apache-maven-3.6.1/bin:$PATH && \ - echo "export PATH=\"/opt/apache-maven-3.6.1:$PATH\"" >> "$HOME/.cus_zshrc" - cd $OLD_DIR - fi -fi +apt install maven -y +# if [ "Y$OPT_JAVA" == "Yyes" ];then +# OLD_DIR=`pwd` +# if [ ! -d ~/.config/coc/extensions/coc-java-data/server/config_linux ];then +# mkdir -p ~/.config/coc/extensions/coc-java-data/server && \ +# cd ~/.config/coc/extensions/coc-java-data/server && \ +# axel https://download.eclipse.org/jdtls/milestones/0.35.0/jdt-language-server-0.35.0-201903142358.tar.gz && \ +# tar xf jdt-language-server-0.35.0-201903142358.tar.gz && rm jdt-language-server*.tar.gz +# fi +# cd $OLD_DIR +# if [ ! -d /opt/apache-maven-3.6.1 ];then +# # install maven +# cd /opt && \ +# wget http://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz && \ +# tar xf apache-maven-3.6.1-bin.tar.gz && \ +# export PATH=/opt/apache-maven-3.6.1/bin:$PATH && \ +# echo "export PATH=\"/opt/apache-maven-3.6.1:$PATH\"" >> "$HOME/.cus_zshrc" +# cd $OLD_DIR +# fi +# fi diff --git a/tools/jdk/init.sh b/tools/jdk/init.sh index 4ae594c..905fd8c 100644 --- a/tools/jdk/init.sh +++ b/tools/jdk/init.sh @@ -20,6 +20,9 @@ function jdk(){ export PATH="/usr/lib/jvm/jdk${JDK_VERSION}/bin:$PATH" fi } + + if [ ! -f /usr/lib/jvm/jdk${JDK_VERSION}/bin/java ];then - jdk + #jdk + apt install -y openjdk-14-jdk fi diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index dfb7771..bcb8c0a 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -95,10 +95,7 @@ function python_ins(){ } function java_ins(){ - ! ( grep -F "leetcode_solution_filetype" ~/.config/nvim/init.vim ) && \ -cat >> ~/.config/nvim/init.vim < Date: Mon, 6 Jul 2020 17:45:14 +0800 Subject: [PATCH 15/21] php language server --- tools/dep/ubuntu_init.sh | 1 + tools/neovim/ubuntu_init.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index b25120e..0a4f7dd 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -38,6 +38,7 @@ if [ "Y$OPT_BASH" == "Yyes" ];then fi if [ "Y$OPT_PHP" == "Yyes" ];then + apt install php -y npm i -g intelephense fi diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index bcb8c0a..65612c9 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -138,8 +138,8 @@ function php_ins(){ END chmod u+x /usr/local/bin/phpxd - ! ( grep -F "languageserver" ~/.config/nvim/coc-settings.json ) && \ - sed -i '/suggest.timeout/i "languageserver": { \n"intelephense": {\n"command": "intelephense",\n"args": ["--stdio"],\n"filetypes": ["php"],\n"initializationOptions": {\n"storagePath": "/tmp/intelephense"\n }\n }\n},' ~/.config/nvim/coc-settings.json + ! ( grep -F "intelephense" ~/.config/nvim/coc-settings.json ) && \ + sed -i '/languageserver/a "intelephense": {\n"command": "intelephense",\n"args": ["--stdio"],\n"filetypes": ["php"],\n"initializationOptions": {\n"storagePath": "/tmp/intelephense"\n }\n },' ~/.config/nvim/coc-settings.json } From 09eccee3b50f8c83f8b327fb032955c64f7ff1cc Mon Sep 17 00:00:00 2001 From: zhoupro Date: Mon, 12 Oct 2020 08:23:13 +0800 Subject: [PATCH 16/21] del sth --- init.sh | 7 +- tools/clipper/com.wincent.clipper.plist | 21 ---- tools/clipper/mac_init.sh | 6 -- tools/karabiner/mac_init.sh | 10 -- tools/neovim/add_swap.sh | 23 ----- tools/neovim/config.yml | 4 - tools/neovim/del_swap.sh | 19 ---- tools/neovim/init.vim | 125 +----------------------- tools/neovim/ubuntu_init.sh | 88 ++--------------- tools/phoenix/mac_init.sh | 11 --- tools/zsh/ubuntu_init.sh | 32 ------ 11 files changed, 15 insertions(+), 331 deletions(-) delete mode 100644 tools/clipper/com.wincent.clipper.plist delete mode 100644 tools/clipper/mac_init.sh delete mode 100644 tools/karabiner/mac_init.sh delete mode 100644 tools/neovim/add_swap.sh delete mode 100644 tools/neovim/config.yml delete mode 100644 tools/neovim/del_swap.sh delete mode 100644 tools/phoenix/mac_init.sh diff --git a/init.sh b/init.sh index 08a580d..758b350 100755 --- a/init.sh +++ b/init.sh @@ -20,10 +20,5 @@ fi ins tmux ins zsh ins neovim -#main tools end -ins hyper -ins karabiner -ins ssh -ins phoenix -ins clipper +#ins ssh # vim: set ts=4 sw=4 tw=0 et : diff --git a/tools/clipper/com.wincent.clipper.plist b/tools/clipper/com.wincent.clipper.plist deleted file mode 100644 index 21b50f6..0000000 --- a/tools/clipper/com.wincent.clipper.plist +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Label - com.wincent.clipper - ProgramArguments - - /usr/local/bin/clipper - - EnvironmentVariables - - LANG - en_US.UTF-8 - - KeepAlive - - LimitLoadToSessionType - Aqua - - diff --git a/tools/clipper/mac_init.sh b/tools/clipper/mac_init.sh deleted file mode 100644 index 532c4e2..0000000 --- a/tools/clipper/mac_init.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -if [ ! -f ~/Library/LaunchAgents/com.wincent.clipper.plist ];then - cp tools/clipper/com.wincent.clipper.plist ~/Library/LaunchAgents/ - launchctl load -w -S Aqua ~/Library/LaunchAgents/com.wincent.clipper.plist -fi - diff --git a/tools/karabiner/mac_init.sh b/tools/karabiner/mac_init.sh deleted file mode 100644 index 1bd4c69..0000000 --- a/tools/karabiner/mac_init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -if [ ! -d /Applications/Karabiner-Elements.app ];then - wget "https://pqrs.org/osx/karabiner/files/Karabiner-Elements-12.1.0.dmg" - sudo hdiutil attach -quiet "Karabiner-Elements-12.1.0.dmg" - sudo installer -pkg "/Volumes/Karabiner-Elements-12.1.0/Karabiner-Elements.sparkle_guided.pkg" -target / - sudo hdiutil detach "/Volumes/Karabiner-Elements-12.1.0" - rm -rf "Karabiner-Elements-12.1.0.dmg" -fi -rm -rf ~/.config/karabiner/assets/complex_modifications/cap_esc_exchage_terminal.json && \ -wget -P ~/.config/karabiner/assets/complex_modifications/ https://raw.githubusercontent.com/zhoupro/cap_esc_exchange_terminal/master/cap_esc_exchage_terminal.json diff --git a/tools/neovim/add_swap.sh b/tools/neovim/add_swap.sh deleted file mode 100644 index 64192ca..0000000 --- a/tools/neovim/add_swap.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# size of swapfile in megabytes -swapsize=2048 - -# does the swap file already exist? -grep -q "swapfile" /etc/fstab - -# if not then create it -if [ $? -ne 0 ]; then - echo 'swapfile not found. Adding swapfile.' - fallocate -l ${swapsize}M /swapfile - chmod 600 /swapfile - mkswap /swapfile - swapon /swapfile - echo '/swapfile none swap defaults 0 0' >> /etc/fstab -else - echo 'swapfile found. No changes made.' -fi - -# output results to terminal -cat /proc/swaps -cat /proc/meminfo | grep Swap diff --git a/tools/neovim/config.yml b/tools/neovim/config.yml deleted file mode 100644 index 9e40b21..0000000 --- a/tools/neovim/config.yml +++ /dev/null @@ -1,4 +0,0 @@ -connections: - - alias: dsn_mysql - 'driver': 'mysql' - 'dataSourceName': 'root:zsz123@tcp(127.0.0.1:3306)/mysql' diff --git a/tools/neovim/del_swap.sh b/tools/neovim/del_swap.sh deleted file mode 100644 index f5537e8..0000000 --- a/tools/neovim/del_swap.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# does the swap file exist? -grep -q "swapfile" /etc/fstab - -# if it does then remove it -if [ $? -eq 0 ]; then - echo 'swapfile found. Removing swapfile.' - sed -i '/swapfile/d' /etc/fstab - echo "3" > /proc/sys/vm/drop_caches - swapoff -a - rm -f /swapfile -else - echo 'No swapfile found. No changes made.' -fi - -# output results to terminal -cat /proc/swaps -cat /proc/meminfo | grep Swap diff --git a/tools/neovim/init.vim b/tools/neovim/init.vim index e825860..8374b4a 100755 --- a/tools/neovim/init.vim +++ b/tools/neovim/init.vim @@ -29,49 +29,29 @@ call plug#begin('~/.local/share/nvim/plugged') Plug 'tpope/vim-abolish' Plug 'tpope/vim-surround' Plug 'tpope/vim-repeat' - " snips - Plug 'SirVer/ultisnips' - Plug 'honza/vim-snippets' - " 语言语法高亮 - Plug 'sheerun/vim-polyglot' " num rep Plug 'glts/vim-magnum' Plug 'glts/vim-radical' " mru Plug 'vim-scripts/mru.vim' - " start screen - Plug 'mhinz/vim-startify' - " add header - Plug 'alpertuna/vim-header' " select Plug 'terryma/vim-expand-region' - "nginx - Plug 'chr4/nginx.vim' " icon Plug 'ryanoasis/vim-devicons' - " tmux - Plug 'christoomey/vim-tmux-navigator' - " emmet - Plug 'mattn/emmet-vim' "indent Plug 'Yggdroot/indentLine' "undo Plug 'mbbill/undotree' Plug 'wellle/targets.vim' - Plug 'forevernull/vim-json-format' - Plug 'paroxayte/vwm.vim' Plug 'jiangmiao/auto-pairs' call plug#end() " our will be the space key let mapleader="," set noswapfile -map js :call json_format#parse("l") " : completion. inoremap pumvisible() ? "\" : "\" -"words -"set dictionary=/usr/share/dict/words " Highlight search results set hlsearch " Makes search act like search in modern browsers @@ -112,48 +92,6 @@ endfunc autocmd VimEnter * noremap t :call RunProgram() " ctags set tags=tags; " ; 不可省略，表示若当前目录中不存在tags，则在父目录中寻找。 -nmap ]s :call GenCscope() -func! GenCscope() - exec "w" - if &filetype == 'php' - exec '!find . -name "*.php" > cscope.files' - exec "!cscope -bkq -i cscope.files" - exec "!(cat cscope.files | ctags -f tags --languages=php --php-kinds=ctif --fields=+aimS -L -)" - elseif &filetype == 'c' || &filetype == 'cpp' || &filetype == 'h' || &filetype == 'cc' || &filetype == 'c++' - exec '!find . -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.cc" -o -name "*.c++" > cscope.files' - exec "!cscope -bkq -i cscope.files" - exec "!(cat cscope.files | ctags -f tags --c++-kinds=+p --fields=+iaS --extras=+q -L -)" - endif -endfunc - -if has("cscope") - set cscopetag " 使支持用 Ctrl+] 和 Ctrl+t 快捷键在代码间跳来跳去 - " check cscope for definition of a symbol before checking ctags: - " set to 1 if you want the reverse search order. - set csto=1 - nmap [s :cs find s =expand("") - nmap [g :cs find g =expand("") - nmap [c :cs find c =expand("") - nmap [t :cs find t =expand("") - nmap [e :cs find e =expand("") - nmap [f :cs find f =expand("") - nmap [i :cs find i =expand("")$ - nmap [d :cs find d =expand("") -endif -" Autoloading Cscope Database -function! LoadCscope() - let db = findfile("cscope.out", ".;") - if (!empty(db)) - let path = strpart(db, 0, match(db, "/cscope.out$")) - set nocscopeverbose " suppress 'duplicate connection' error - exe "cs add " . db . " " . path - set cscopeverbose - " else add the database pointed to by environment variable - elseif $CSCOPE_DB != "" - cs add $CSCOPE_DB - endif -endfunction -au BufEnter /* call LoadCscope() " for debug set nu @@ -163,30 +101,9 @@ set list nnoremap f :Files nnoremap e :MRU -" PHP debug -let g:vdebug_options= { - \ "port" : 9010, - \ "server" : '0.0.0.0', - \ "timeout" : 100, - \ "on_close" : 'detach', - \ "break_on_open" : 1, - \ "ide_key" : 'xdebug', - \ "path_maps" : {}, - \ "debug_window_level" : 0, - \ "debug_file_level" : 0, - \ "debug_file" : "", - \ "watch_window_style" : 'expanded', - \ "marker_default" : '⬦', - \ "marker_closed_tree" : '▸', - \ "marker_open_tree" : '▾' - \} -highlight DbgBreakptLine ctermbg=none ctermfg=none -highlight DbgBreakptSign ctermbg=none ctermfg=10 -highlight DbgCurrentLine ctermbg=none ctermfg=none -highlight DbgCurrentSign ctermbg=none ctermfg=red - nnoremap y :call system('NCCOMMAND NCHOST 8377', @0) nnoremap ] :call fzf#vim#tags('^' . expand(''), {'options': '--exact --select-1 --exit-0 +i'}) + " color change fix in tmux set t_Co=256 "switch windows @@ -208,20 +125,13 @@ if has('nvim') vnoremap l

l " Normal mode: nnoremap h h - nnoremap j ji + nnoremap j j nnoremap k k nnoremap l l endif -set scrolloff=5 -let g:header_auto_add_header = 0 -let g:tmux_navigator_no_mappings = 1 -nnoremap

:TmuxNavigateLeft -nnoremap

:TmuxNavigateUp -nnoremap

:TmuxNavigatePrevious " backward noremap \ , -let g:polyglot_disabled = ['markdown'] " buf tab let g:airline#extensions#tabline#enabled = 1 @@ -241,6 +151,7 @@ nmap 6 AirlineSelectTab6 nmap 7 AirlineSelectTab7 nmap 8 AirlineSelectTab8 nmap 9 AirlineSelectTab9 + command! -bang -nargs=* Rg \ call fzf#vim#grep( \ 'rg --column --line-number --hidden --ignore-case --ignore-file ~/.fzf_ignore --no-heading --color=always '., 1, @@ -248,10 +159,6 @@ command! -bang -nargs=* Rg \ : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'), \ 0) nnoremap a :Rg

-if has("persistent_undo") - set undodir=~/.undodir/ - set undofile -endif " tab 替换为4个空格 set tabstop=4 @@ -268,6 +175,7 @@ function! AppendModeline() call append(line("$"), l:modeline) endfunction nnoremap ml :call AppendModeline() + " add current file to ignore file command Gg call system('echo '.expand("%"). '>> .git/info/exclude') " remove current file from ignore file @@ -277,28 +185,5 @@ fu! s:isdir(dir) abort return !empty(a:dir) && (isdirectory(a:dir) || \ (!empty($SYSTEMDRIVE) && isdirectory('/'.tolower($SYSTEMDRIVE[0]).a:dir))) endfu -set foldmethod=manual -let s:bot = { -\ 'name': 'bot', -\ 'set_all': ['nonu', 'nornu'], -\ 'bot': -\ { -\ 'h_sz': 12, -\ 'init': [ 'term zsh' ] -\ } -\ } -let g:vwm#layouts = [s:bot] - -" clang_format -let g:clang_format#style_options = { - \ "AccessModifierOffset" : -4, - \ "AllowShortIfStatementsOnASingleLine" : "true", - \ "AlwaysBreakTemplateDeclarations" : "true", - \ "Standard" : "C++11"} - -" map to cf in C++ code -autocmd FileType c,cpp,objc nnoremap cf :ClangFormat -autocmd FileType c,cpp,objc vnoremap cf :ClangFormat -" Toggle auto formatting: -nmap C :ClangFormatAutoToggle +set foldmethod=manual diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh index 65612c9..39559e9 100755 --- a/tools/neovim/ubuntu_init.sh +++ b/tools/neovim/ubuntu_init.sh @@ -1,54 +1,12 @@ #!/bin/bash function c_ins(){ - ! (grep -F 'nvim-gdb' ~/.config/nvim/init.vim &>/dev/null ) && \ - sed -i "/plug#begin/aPlug 'vim-scripts/a.vim'" ~/.config/nvim/init.vim && \ - sed -i "/plug#begin/aPlug 'gauteh/vim-cppman'" ~/.config/nvim/init.vim && \ - sed -i "/plug#begin/aPlug 'rhysd/vim-clang-format'" ~/.config/nvim/init.vim && \ - sed -i "/plug#begin/aPlug 'sakhnik/nvim-gdb' , { 'branch': 'legacy' }" ~/.config/nvim/init.vim - #! ( grep -F "objcpp" ~/.config/nvim/coc-settings.json ) && \ - #sed -i '/languageserver/a "clangd": {\n"command": "clangd",\n"args":["-background-index"],\n"filetypes": ["c", "cpp", "objc", "objcpp"]\n},' ~/.config/nvim/coc-settings.json + echo "no" } function sql_ins(){ - - rm ~/.config/sqls -rf && \ - mkdir -p ~/.config/sqls/ && \ - cp tools/neovim/config.yml ~/.config/sqls/ - - ! (grep -F 'lighttiger2505/sqls.vim' ~/.config/nvim/init.vim &>/dev/null ) && \ - sed -i "/plug#begin/aPlug 'lighttiger2505/sqls.vim'" ~/.config/nvim/init.vim && \ - sed -i "/plug#begin/aPlug 'prabirshrestha/vim-lsp'" ~/.config/nvim/init.vim && \ - sed -i "/plug#begin/aPlug 'prabirshrestha/async.vim'" ~/.config/nvim/init.vim - - ! ( grep -F "config.yml" ~/.config/nvim/coc-settings.json ) && \ - sed -i '/languageserver/a "sql": {\n"command": "sqls",\n"args":["-config", "/root/.config/sqls/config.yml"],\n"filetypes": ["sql"]\n},' ~/.config/nvim/coc-settings.json - - ! ( grep -F "LspSqls" ~/.config/nvim/init.vim ) && \ -cat >> ~/.config/nvim/init.vim <['sqls']}, - \ 'whitelist': ['sql'], - \ 'workspace_config': { - \ 'sqls': { - \ 'connections': [ - \ { - \ 'driver': 'mysql', - \ 'dataSourceName': 'root:zsz123@tcp(127.0.0.1:3306)/test', - \ }, - \ ], - \ }, - \ }, - \ }) - augroup END -endif -END - + echo "no" } @@ -99,8 +57,7 @@ function java_ins(){ } function lua_ins(){ - ! ( grep -F "languageserver" ~/.config/nvim/coc-settings.json ) && \ - sed -i '/suggest.timeout/i "languageserver": {\n"lua": {\n"command": "lua-lsp",\n"filetypes": ["lua"]\n}\n },' ~/.config/nvim/coc-settings.json + echo "no" } function bash_ins(){ @@ -128,18 +85,7 @@ END } function php_ins(){ - ! (grep -F 'vim-php-cs-fixer' ~/.config/nvim/init.vim &>/dev/null ) && \ - sed -i "/plug#begin/aPlug 'stephpy/vim-php-cs-fixer'" ~/.config/nvim/init.vim && \ - sed -i "/plug#begin/aPlug 'vim-vdebug/vdebug'" ~/.config/nvim/init.vim - cat > /usr/local/bin/phpxd <> ~/.config/nvim/init.vim ! ( grep -F "cus_ini_env" ~/.env ) && \ cat tools/neovim/env.ini >> ~/.env -# [ ! -f /usr/local/bin/genUrl ] &&\ -# cp tools/neovim/genUrl.sh /usr/local/bin/genUrl && chmod u+x /usr/local/bin/genUrl -# [ ! -d /usr/local/vimsplain ] &&\ -# git clone https://github.com/pafcu/vimsplain.git /usr/local/vimsplain -#rm -rf ~/.gdbinit && cp tools/neovim/gdbinit ~/.gdbinit - ! ( grep -F "defx_my_settings" ~/.config/nvim/init.vim ) && \ cat >> ~/.config/nvim/init.vim </dev/null ) && \ -echo 'export LC_ALL=zh_CN.UTF-8' >> "$HOME/.env" && \ -echo 'export LANG=zh_CN.UTF-8' >> "$HOME/.env" && \ -echo "export PATH=\$PATH:$HOME/.composer/vendor/bin" >> "$HOME/.env" - ! (grep -F 'zsh-syntax-highlighting' ~/.cus_zshrc &>/dev/null ) && \ cat >> ~/.cus_zshrc </dev/null ) && \ - echo 'if [ -f ~/.env ];then; source ~/.env;fi' >> ~/.zshrc - -! (grep -F 'history-incremental-search-backward' ~/.cus_zshrc &>/dev/null ) && \ -cat >> ~/.cus_zshrc < Date: Thu, 15 Oct 2020 08:19:30 +0800 Subject: [PATCH 17/21] vimspector --- tools/neovim/init.vim | 1 + tools/neovim/vimspector.json | 139 +++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 tools/neovim/vimspector.json diff --git a/tools/neovim/init.vim b/tools/neovim/init.vim index 8374b4a..066bb1b 100755 --- a/tools/neovim/init.vim +++ b/tools/neovim/init.vim @@ -1,4 +1,5 @@ call plug#begin('~/.local/share/nvim/plugged') + Plug 'puremourning/vimspector', { 'dir': '~/.vim/vimspector-config', 'do': './install_gadget.py ' } "complete Plug 'neoclide/coc.nvim', {'branch': 'release'} "outline diff --git a/tools/neovim/vimspector.json b/tools/neovim/vimspector.json new file mode 100644 index 0000000..19ac953 --- /dev/null +++ b/tools/neovim/vimspector.json @@ -0,0 +1,139 @@ +{ + + "configurations": { + + "Python: Attach To Vim": { + + "variables": { + + "port": "5678", + + "host": "localhost" + + }, + + "adapter": "multi-session", + + "configuration": { + + "request": "attach" + + } + + }, + + "Python: Run current script": { + + "adapter": "debugpy", + + "configuration": { + + "request": "launch", + + "program": "${file}", + + "args": [ "*${args:--update-gadget-config}" ], + + "justMyCode#json": "${justMyCode:false}" + + } + + }, + + + + "cpp Launch": { + + "adapter": "vscode-cpptools", + + "configuration": { + + "request": "launch", + + "args": [ "*${args:-x /root/workspace/linux-0.12/oslab/bochs/.gdbrc}" ], + + "program": "/root/workspace/linux-0.12/linux-0.12/tools/system", + + "MIMode": "gdb", + + "stopAtEntry": true, + + "miDebuggerServerAddress": "localhost:1234" + + + + + + } + + }, + + "run go": { + + "adapter": "vscode-go", + + "configuration": { + + "request": "launch", + + "program": "${fileDirname}", + + "mode": "debug", + + "dlvToolPath": "$HOME/go/bin/dlv" + + } + + }, + + "Listen for XDebug": { + + "adapter": "vscode-php-debug", + + "configuration": { + + "name": "Listen for XDebug", + + "type": "php", + + "request": "launch", + + "port": 9000, + + "stopOnEntry": false, + + "pathMappings": { + + "/var/www/html": "${workspaceRoot}" + + } + + } + + }, + + "Launch currently open script": { + + "adapter": "vscode-php-debug", + + "configuration": { + + "name": "Launch currently open script", + + "type": "php", + + "request": "launch", + + "program": "${file}", + + "cwd": "${fileDirname}", + + "port": 9000 + + } + + } + +} + +} From 7cfa67be7e5fcaa31fa30a46c32a4c019d86471d Mon Sep 17 00:00:00 2001 From: zhoupro Date: Sat, 17 Oct 2020 01:21:02 +0800 Subject: [PATCH 18/21] remove sth --- init.sh | 12 +- tools/dep/centos_init.sh | 20 - tools/dep/mac_init.sh | 20 - tools/dep/ubuntu_init.sh | 27 - tools/hyper/hyper.js | 164 ----- tools/hyper/mac_init.sh | 12 - tools/jdk/init.sh | 28 - tools/jdk/mac_init.sh | 20 - tools/neovim/base_init.vim | 384 ------------ tools/neovim/c_cnt.sh | 11 - tools/neovim/centos_init.sh | 39 -- tools/neovim/cfg.ini | 3 - tools/neovim/env.ini | 5 - tools/neovim/gdbinit | 2 - tools/neovim/genUrl.sh | 35 -- tools/neovim/init.vim | 12 +- tools/neovim/mac_init.sh | 38 -- tools/neovim/ubuntu_init.sh | 17 +- tools/neovim/vimspector.json | 84 +-- tools/pxy/init.sh | 7 - tools/pxy/pxy.sh | 35 -- tools/ssh/mac_init.sh | 4 - tools/ssh/ssh.exp | 14 - tools/tmux/centos_init.sh | 22 - tools/tmux/mac_init.sh | 5 - tools/tmux/tmux.conf | 1152 ---------------------------------- tools/tmux/tmux.conf.local | 325 ---------- tools/tmux/ubuntu_init.sh | 4 + tools/zsh/centos_init.sh | 92 --- tools/zsh/mac_init.sh | 81 --- tools/zsh/ubuntu_init.sh | 21 +- 31 files changed, 53 insertions(+), 2642 deletions(-) delete mode 100644 tools/dep/centos_init.sh delete mode 100644 tools/dep/mac_init.sh delete mode 100644 tools/hyper/hyper.js delete mode 100755 tools/hyper/mac_init.sh delete mode 100644 tools/jdk/init.sh delete mode 100644 tools/jdk/mac_init.sh delete mode 100755 tools/neovim/base_init.vim delete mode 100755 tools/neovim/c_cnt.sh delete mode 100644 tools/neovim/centos_init.sh delete mode 100644 tools/neovim/cfg.ini delete mode 100644 tools/neovim/env.ini delete mode 100644 tools/neovim/gdbinit delete mode 100644 tools/neovim/genUrl.sh delete mode 100644 tools/neovim/mac_init.sh delete mode 100644 tools/pxy/init.sh delete mode 100755 tools/pxy/pxy.sh delete mode 100644 tools/ssh/mac_init.sh delete mode 100755 tools/ssh/ssh.exp delete mode 100755 tools/tmux/centos_init.sh delete mode 100755 tools/tmux/mac_init.sh delete mode 100644 tools/tmux/tmux.conf delete mode 100644 tools/tmux/tmux.conf.local delete mode 100644 tools/zsh/centos_init.sh delete mode 100755 tools/zsh/mac_init.sh diff --git a/init.sh b/init.sh index 758b350..d46169b 100755 --- a/init.sh +++ b/init.sh @@ -9,16 +9,10 @@ source "./helper/system_info.sh" source "./helper/installer.sh" source "./helper/option.sh" ins dep -ins pxy -if [ "Y$OPT_JAVA" == "Yyes" ];then - ins jdk -fi +ins neovim +#ins tmux +#ins zsh -# main tools start -ins tmux -ins zsh -ins neovim -#ins ssh # vim: set ts=4 sw=4 tw=0 et : diff --git a/tools/dep/centos_init.sh b/tools/dep/centos_init.sh deleted file mode 100644 index 82b3277..0000000 --- a/tools/dep/centos_init.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -! which rg && \ -sudo yum-config-manager --add-repo=https://copr.fedorainfracloud.org/coprs/carlwgeorge/ripgrep/repo/epel-7/carlwgeorge-ripgrep-epel-7.repo && \ -sudo yum install -y ripgrep - -! which fzf && \ -wget https://github.com/junegunn/fzf-bin/releases/download/0.17.5/fzf-0.17.5-linux_amd64.tgz && -tar xzvf fzf-0.17.5-linux_amd64.tgz && sudo mv fzf "/usr/local/bin" && rm fzf-*.tgz - -sudo yum install -y python34-pip -sudo yum install -y python2-pip zsh - - -! which netcat && \ -wget http://sourceforge.net/projects/netcat/files/netcat/0.7.1/netcat-0.7.1.tar.gz && \ -tar xzvf netcat-0.7.1.tar.gz && \ -cd netcat-0.7.1 && \ -./configure && make && make install && \ -cd .. diff --git a/tools/dep/mac_init.sh b/tools/dep/mac_init.sh deleted file mode 100644 index b6521bf..0000000 --- a/tools/dep/mac_init.sh +++ /dev/null @@ -1,20 +0,0 @@ -which brew -if ! which brew;then - /usr/bin/ruby -e \ - "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -fi - -apps="wget fzf ripgrep autojump netcat iproute2mac clipper nmap graphviz" -for app in $apps -do - ! brew list | grep $app && brew install $app -done - -! brew list | grep python && brew install python3 -! brew list | grep python@2 && brew install python2 -! brew list | grep node && brew install node -! brew list | grep yarn && brew install yarn -! ls /Library/Fonts | grep Fura && -wget https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/patched-fonts/FiraCode/Retina/complete/Fura%20Code%20Retina%20Nerd%20Font%20Complete%20Mono.ttf && \ -mv Fura*Mono.ttf /Library/Fonts -! brew list | grep gnu-sed && brew install coreutils findutils gnu-tar gnu-sed gawk gnutls gnu-indent gnu-getopt grep diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh index 0a4f7dd..893eddc 100644 --- a/tools/dep/ubuntu_init.sh +++ b/tools/dep/ubuntu_init.sh @@ -11,18 +11,12 @@ apt-get remove -y neovim exuberant-ctags -#install lazygit -#if [ ! -f /usr/local/bin/lazygit ]; then -# wget https://github.com/jesseduffield/lazygit/releases/download/v0.13/lazygit_0.13_Linux_x86_64.tar.gz && tar xzvf lazygit_0.13_Linux_x86_64.tar.gz && mv lazygit /usr/local/bin/ && chmod u+x /usr/local/bin/lazygit -#fi - if [ "Y$OPT_MAN" == "Yyes" ];then [ -f /etc/dpkg/dpkg.cfg.d/excludes ] && rm -rf /etc/dpkg/dpkg.cfg.d/excludes apt-get install -y \ cppman man manpages manpages-dev manpages-posix manpages-posix-dev fi -#install clangd8 url:https://apt.llvm.org/ if [ "Y$OPT_CPP" == "Yyes" ];then apt-get install -y \ valgrind clangd cscope gdb @@ -71,24 +65,3 @@ if [ "Y$OPT_FE" == "Yyes" ];then sudo npm install -g vscode-css-languageserver-bin fi -apt install maven -y -# if [ "Y$OPT_JAVA" == "Yyes" ];then -# OLD_DIR=`pwd` -# if [ ! -d ~/.config/coc/extensions/coc-java-data/server/config_linux ];then -# mkdir -p ~/.config/coc/extensions/coc-java-data/server && \ -# cd ~/.config/coc/extensions/coc-java-data/server && \ -# axel https://download.eclipse.org/jdtls/milestones/0.35.0/jdt-language-server-0.35.0-201903142358.tar.gz && \ -# tar xf jdt-language-server-0.35.0-201903142358.tar.gz && rm jdt-language-server*.tar.gz -# fi -# cd $OLD_DIR -# if [ ! -d /opt/apache-maven-3.6.1 ];then -# # install maven -# cd /opt && \ -# wget http://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz && \ -# tar xf apache-maven-3.6.1-bin.tar.gz && \ -# export PATH=/opt/apache-maven-3.6.1/bin:$PATH && \ -# echo "export PATH=\"/opt/apache-maven-3.6.1:$PATH\"" >> "$HOME/.cus_zshrc" -# cd $OLD_DIR -# fi -# fi - diff --git a/tools/hyper/hyper.js b/tools/hyper/hyper.js deleted file mode 100644 index 78a014a..0000000 --- a/tools/hyper/hyper.js +++ /dev/null @@ -1,164 +0,0 @@ -// Future versions of Hyper may add additional config options, -// which will not automatically be merged into this file. -// See https://hyper.is#cfg for all currently supported options. - -module.exports = { - config: { - // choose either `'stable'` for receiving highly polished, - // or `'canary'` for less polished but more frequent updates - updateChannel: 'stable', - - // default font size in pixels for all tabs - fontSize: 16, - - // font family with optional fallbacks - fontFamily: '"FuraCode Nerd Font Mono", Menlo, "DejaVu Sans Mono", Consolas, "Lucida Console", monospace', - // default font weight: 'normal' or 'bold' - fontWeight: 'normal', - - // font weight for bold characters: 'normal' or 'bold' - fontWeightBold: 'bold', - - // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) - cursorColor: 'rgba(248,28,229,0.8)', - - // terminal text color under BLOCK cursor - cursorAccentColor: '#000', - - // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █ - cursorShape: 'BLOCK', - - // set to `true` (without backticks and without quotes) for blinking cursor - cursorBlink: false, - - // color of the text - foregroundColor: '#fff', - - // terminal background color - // opacity is only supported on macOS - backgroundColor: '#000', - - // terminal selection color - selectionColor: 'rgba(248,28,229,0.3)', - - // border color (window, tabs) - borderColor: '#333', - - // custom CSS to embed in the main window - css: '', - - // custom CSS to embed in the terminal window - termCSS: '', - - // if you're using a Linux setup which show native menus, set to false - // default: `true` on Linux, `true` on Windows, ignored on macOS - showHamburgerMenu: '', - - // set to `false` (without backticks and without quotes) if you want to hide the minimize, maximize and close buttons - // additionally, set to `'left'` if you want them on the left, like in Ubuntu - // default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS - showWindowControls: '', - - // custom padding (CSS format, i.e.: `top right bottom left`) - padding: '3px 0px 14px 0px', - - // the full list. if you're going to provide the full color palette, - // including the 6 x 6 color cubes and the grayscale map, just provide - // an array here instead of a color map object - colors: { - black: '#000000', - red: '#C51E14', - green: '#1DC121', - yellow: '#C7C329', - blue: '#0A2FC4', - magenta: '#C839C5', - cyan: '#20C5C6', - white: '#C7C7C7', - lightBlack: '#686868', - lightRed: '#FD6F6B', - lightGreen: '#67F86F', - lightYellow: '#FFFA72', - lightBlue: '#6A76FB', - lightMagenta: '#FD7CFC', - lightCyan: '#68FDFE', - lightWhite: '#FFFFFF', - }, - - // the shell to run when spawning a new session (i.e. /usr/local/bin/fish) - // if left empty, your system's login shell will be used by default - // - // Windows - // - Make sure to use a full path if the binary name doesn't work - // - Remove `--login` in shellArgs - // - // Bash on Windows - // - Example: `C:\\Windows\\System32\\bash.exe` - // - // PowerShell on Windows - // - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` - shell: '', - - // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`) - // by default `['--login']` will be used - shellArgs: ['--login'], - - // for environment variables - env: {}, - - // set to `false` for no bell - bell: 'SOUND', - - // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard - copyOnSelect: false, - - // if `true` (without backticks and without quotes), hyper will be set as the default protocol client for SSH - defaultSSHApp: true, - - // if `true` (without backticks and without quotes), on right click selected text will be copied or pasted if no - // selection is present (`true` by default on Windows and disables the context menu feature) - // quickEdit: true, - - // URL to custom bell - // bellSoundURL: 'http://example.com/bell.mp3', - - // for advanced config flags please refer to https://hyper.is/#cfg - - hyperTabs: { - trafficButtons: true, - border: true, - tabIconsColored: true, - activityColor: 'salmon', - }, - visor: { - hotkey: 'Command+P', - position: 'top', // or left, right, bottom - }, - }, - - - // a list of plugins to fetch and install from npm - // format: [@org/]project[#version] - // examples: - // `hyperpower` - // `@company/project` - // `project#1.0.1` - plugins: [ - 'hyper-one-dark', - 'hyper-tabs-enhanced', - "hyper-dark-scrollbar", - "hyper-search", - "hyperterm-visor", - ], - - - - // in development, you can create a directory under - // `~/.hyper_plugins/local/` and include it here - // to load it and avoid it being `npm install`ed - localPlugins: [], - - keymaps: { - // Example - // 'window:devtools': 'cmd+alt+o', - }, -}; diff --git a/tools/hyper/mac_init.sh b/tools/hyper/mac_init.sh deleted file mode 100755 index b775bae..0000000 --- a/tools/hyper/mac_init.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -rm ~/.hyper.js -cp tools/hyper/hyper.js ~/.hyper.js -if [ -d "/Applications/Hyper.app" ];then - return -fi - -wget "https://github.com/zeit/hyper/releases/download/2.1.0/Hyper-2.1.0.dmg" -sudo hdiutil attach -quiet "Hyper-2.1.0.dmg" -sudo cp -r "/Volumes/Hyper 2.1.0/Hyper.app" /Applications -sudo hdiutil detach "/Volumes/Hyper 2.1.0" -rm -rf "Hyper-2.1.0.dmg" diff --git a/tools/jdk/init.sh b/tools/jdk/init.sh deleted file mode 100644 index 905fd8c..0000000 --- a/tools/jdk/init.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -JDK_VERSION=11 -function jdk(){ - DOWN_URL="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz" - sudo mkdir -p /usr/lib/jvm && sudo chmod 777 /usr/lib/jvm - if [ ! -d /usr/lib/jvm/jdk${JDK_VERSION} ]; then - if [ ! -f openjdk*.tar.gz ]; - then - echo "downloading jdk ${JDK_VERSION}" - wget $DOWN_URL - fi - rm -rf /usr/lib/jvm/* - tar xzvf openjdk*.tar.gz && mv jdk-11 jdk${JDK_VERSION} && mv jdk${JDK_VERSION} /usr/lib/jvm/ - echo "export JAVA_HOME=/usr/lib/jvm/jdk${JDK_VERSION}" >> "$HOME/.cus_zshrc" - echo "export CLASSPATH=\".:/usr/lib/jvm/jdk${JDK_VERSION}/lib:/usr/lib/jvm/jdk${JDK_VERSION}\"" >> "$HOME/.cus_zshrc" - echo "export PATH=\"/usr/lib/jvm/jdk${JDK_VERSION}/bin:$PATH\"" >> "$HOME/.cus_zshrc" - export JAVA_HOME="/usr/lib/jdk${JDK_VERSION}" - export CLASSPATH=".:/usr/lib/jvm/jdk${JDK_VERSION}/lib:/usr/lib/jvm/jdk${JDK_VERSION}" - export PATH="/usr/lib/jvm/jdk${JDK_VERSION}/bin:$PATH" - fi -} - - -if [ ! -f /usr/lib/jvm/jdk${JDK_VERSION}/bin/java ];then - #jdk - apt install -y openjdk-14-jdk -fi diff --git a/tools/jdk/mac_init.sh b/tools/jdk/mac_init.sh deleted file mode 100644 index a504c66..0000000 --- a/tools/jdk/mac_init.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -#http://www.linuxidc.com/Linux/2016-06/132678.htm - -function downloadjdk(){ - wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/11.0.2+9/f51449fcd52f4d52b93a989c5c56ed3c/jdk-11.0.2_osx-x64_bin.dmg -} - - -function jdk(){ - if [ ! -f jdk-11.0.2_osx-x64_bin.dmg ];then - downloadjdk - fi - sudo hdiutil attach -quiet jdk-11.0.2_osx-x64_bin.dmg - sudo installer -pkg /Volumes/JDK\ 11.0.2/JDK\ 11.0.2.pkg -target "/" - sudo hdiutil detach "/Volumes/JDK 11.0.2" - -} -if [ ! -d /Library/Java/JavaVirtualMachines/jdk-11.0.2.jdk ];then - jdk -fi diff --git a/tools/neovim/base_init.vim b/tools/neovim/base_init.vim deleted file mode 100755 index 85d82de..0000000 --- a/tools/neovim/base_init.vim +++ /dev/null @@ -1,384 +0,0 @@ -call plug#begin('~/.local/share/nvim/plugged') - "deop - Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } - "outline - Plug 'majutsushi/tagbar' - Plug 'vim-airline/vim-airline' - Plug 'vim-airline/vim-airline-themes' - " explore - Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } - Plug 'junegunn/fzf.vim' - Plug 'vim-scripts/ctags.vim' - Plug 'tpope/vim-commentary' - " explore - if has('nvim') - Plug 'Shougo/defx.nvim', { 'do': ':UpdateRemotePlugins' } - else - Plug 'Shougo/defx.nvim' - Plug 'roxma/nvim-yarp' - Plug 'roxma/vim-hug-neovim-rpc' - endif - Plug 'kristijanhusak/defx-icons' - Plug 'kristijanhusak/defx-git' - "git - Plug 'tpope/vim-fugitive' - Plug 'airblade/vim-gitgutter' - Plug 'gregsexton/gitv' - " c - Plug 'vim-scripts/a.vim' - " transform - Plug 'tpope/vim-abolish' - Plug 'tpope/vim-surround' - Plug 'tpope/vim-repeat' - " snips - Plug 'SirVer/ultisnips' - Plug 'honza/vim-snippets' - " themes - Plug 'joshdick/onedark.vim' - " 语言语法高亮 - Plug 'sheerun/vim-polyglot' - " num rep - Plug 'glts/vim-magnum' - Plug 'glts/vim-radical' - " mru - Plug 'vim-scripts/mru.vim' - " start screen - Plug 'mhinz/vim-startify' - " add header - Plug 'alpertuna/vim-header' - " select - Plug 'terryma/vim-expand-region' - Plug 'terryma/vim-multiple-cursors' - "nginx - Plug 'chr4/nginx.vim' - " icon - Plug 'ryanoasis/vim-devicons' - " tmux - Plug 'christoomey/vim-tmux-navigator' - Plug 'junegunn/goyo.vim' - "indent - Plug 'Yggdroot/indentLine' - "undo - Plug 'mbbill/undotree' - "markdown - " have nodejs and yarn - Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' } - Plug 'wellle/targets.vim' - Plug 'forevernull/vim-json-format' - Plug 'paroxayte/vwm.vim' - Plug 'jiangmiao/auto-pairs' - Plug 'iandingx/leetcode.vim' - " graphviz - Plug 'liuchengxu/graphviz.vim' - call plug#end() - -" our will be the space key -let mapleader="," -set noswapfile -map js :call json_format#parse("l") -" Highlight search results -set hlsearch -" Makes search act like search in modern browsers -set incsearch -" clear highlight -nnoremap

:nohlsearch

-map K (expand_region_expand) -map J (expand_region_shrink) -""""""""""""""""""""""""""""""""""""" -" Mappings configurationn -""""""""""""""""""""""""""""""""""""" -map n :Defx -map m :TagbarOpenAutoClose - -func! RunProgram() - exec "w" - if &filetype == 'c' - exec "!gcc % -o %<" - exec "! ./%<" - elseif &filetype == 'cpp' - exec "!g++ % -o %<" - exec "! ./%<" - elseif &filetype == 'sh' - exec "!bash %" - elseif &filetype == 'go' - exec "!go run %" - elseif &filetype == 'python' - exec "!python %" - elseif &filetype == 'php' - exec "!php %" - elseif &filetype == 'lua' - exec "!lua %" - elseif &filetype == 'dot' - exec "GraphvizCompile png" - exec "Graphviz png" - elseif &filetype == 'java' - exec "!javac %" - exec "!java -cp %:p:h %:t:r" - endif -endfunc -autocmd VimEnter * noremap t :call RunProgram() -" ctags -set tags=tags; " ; 不可省略，表示若当前目录中不存在tags，则在父目录中寻找。 -nmap ]s :call GenCscope() -func! GenCscope() - exec "w" - if &filetype == 'php' - exec '!find . -name "*.php" > cscope.files' - exec "!cscope -bkq -i cscope.files" - exec "!(cat cscope.files | ctags -f tags --languages=php --php-kinds=ctif --fields=+aimS -L -)" - elseif &filetype == 'c' - exec '!find . -name "*.c" -o -name "*.h" > cscope.files' - exec "!cscope -bkq -i cscope.files" - exec "!(cat cscope.files | ctags -f tags --c++-kinds=+p --fields=+iaS --extras=+q -L -)" - endif -endfunc - -if has("cscope") - set cscopetag " 使支持用 Ctrl+] 和 Ctrl+t 快捷键在代码间跳来跳去 - " check cscope for definition of a symbol before checking ctags: - " set to 1 if you want the reverse search order. - set csto=1 - nmap [s :cs find s =expand("") - nmap [g :cs find g =expand("") - nmap [c :cs find c =expand("") - nmap [t :cs find t =expand("") - nmap [e :cs find e =expand("") - nmap [f :cs find f =expand("") - nmap [i :cs find i =expand("")$ - nmap [d :cs find d =expand("") -endif -" Autoloading Cscope Database -function! LoadCscope() - let db = findfile("cscope.out", ".;") - if (!empty(db)) - let path = strpart(db, 0, match(db, "/cscope.out$")) - set nocscopeverbose " suppress 'duplicate connection' error - exe "cs add " . db . " " . path - set cscopeverbose - " else add the database pointed to by environment variable - elseif $CSCOPE_DB != "" - cs add $CSCOPE_DB - endif -endfunction -au BufEnter /* call LoadCscope() - -set background=dark - - -" for debug -set nu -set list - -" exploer -nnoremap f :Files -nnoremap e :MRU - -" snips -" UltiSnips 的 tab 键与 YCM 冲突，重新设定 -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="

" -nnoremap y :call system('NCCOMMAND NCHOST 8377', @0) -nnoremap ] :call fzf#vim#tags('^' . expand(''), {'options': '--exact --select-1 --exit-0 +i'}) - -" color change fix in tmux -set t_Co=256 -"switch windows -if has('nvim') - " Terminal mode: - tnoremap h

h - tnoremap j

j - tnoremap k

k - tnoremap l

l - " Insert mode: - inoremap h

h - inoremap j

j - inoremap k

k - inoremap l

l - " Visual mode: - vnoremap h

h - vnoremap j

j - vnoremap k

k - vnoremap l

l - " Normal mode: - nnoremap h h - nnoremap j ji - nnoremap k k - nnoremap l l -endif -set scrolloff=5 -let g:header_auto_add_header = 0 - -let g:tmux_navigator_no_mappings = 1 -nnoremap

:TmuxNavigateLeft -nnoremap

:TmuxNavigateUp -nnoremap

:TmuxNavigatePrevious - -" backward -noremap \ , -let g:polyglot_disabled = ['markdown'] - -" buf tab -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#tab_nr_type = 1 " tab number -let g:airline#extensions#tabline#show_tab_nr = 1 -let g:airline#extensions#tabline#formatter = 'default' -let g:airline#extensions#tabline#buffer_nr_show = 0 -let g:airline#extensions#tabline#fnametruncate = 16 -let g:airline#extensions#tabline#fnamecollapse = 2 -let g:airline#extensions#tabline#buffer_idx_mode = 1 -nmap 1 AirlineSelectTab1 -nmap 2 AirlineSelectTab2 -nmap 3 AirlineSelectTab3 -nmap 4 AirlineSelectTab4 -nmap 5 AirlineSelectTab5 -nmap 6 AirlineSelectTab6 -nmap 7 AirlineSelectTab7 -nmap 8 AirlineSelectTab8 -nmap 9 AirlineSelectTab9 -command! -bang -nargs=* Rg - \ call fzf#vim#grep( - \ 'rg --column --line-number --hidden --ignore-case --ignore-file ~/.fzf_ignore --no-heading --color=always '., 1, - \ 0 ? fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'up:60%') - \ : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'), - \ 0) -nnoremap a :Rg

-if has("persistent_undo") - set undodir=~/.undodir/ - set undofile -endif -" tab 替换为4个空格 -set tabstop=4 -set shiftwidth=4 -set expandtab - -" Append modeline after last line in buffer. -" Use substitute() instead of printf() to handle '%%s' modeline in LaTeX -" files. -function! AppendModeline() - let l:modeline = printf(" vim: set ts=%d sw=%d tw=%d %set :", - \ &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no') - let l:modeline = substitute(&commentstring, "%s", l:modeline, "") - call append(line("$"), l:modeline) -endfunction -nnoremap ml :call AppendModeline() -" add current file to ignore file -command Gg call system('echo '.expand("%"). '>> .git/info/exclude') -" remove current file from ignore file -command Gr call system('sed -i "s#'.expand("%").'##g" .git/info/exclude') -fu! s:isdir(dir) abort - return !empty(a:dir) && (isdirectory(a:dir) || - \ (!empty($SYSTEMDRIVE) && isdirectory('/'.tolower($SYSTEMDRIVE[0]).a:dir))) -endfu -set foldmethod=manual - -let s:bot = { -\ 'name': 'bot', -\ 'set_all': ['nonu', 'nornu'], -\ 'bot': -\ { -\ 'h_sz': 12, -\ 'init': [ 'term zsh' ] -\ } -\ } - -let g:vwm#layouts = [s:bot] -"https://github.com/Shougo/deoplete.nvim/issues/440 -let g:deoplete#enable_at_startup = 1 -" : completion. -inoremap pumvisible() ? "\" : "\" -let g:deoplete#auto_complete_delay = 150 -let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{}) -autocmd FileType dot let g:deoplete#omni#input_patterns.dot = '\w+|[^. *\t][.:]\w*' -"defx -augroup vimrc_defx - autocmd! - autocmd FileType defx call s:defx_my_settings() "Defx mappings - autocmd VimEnter * call s:setup_defx() -augroup END -let s:default_columns = 'indent:git:icons:filename' -function! s:setup_defx() abort - call defx#custom#option('_', { - \ 'columns': s:default_columns, - \ 'show_ignored_files': 0, - \ 'buffer_name': '', - \ 'toggle': 1, - \ 'resume': 1, - \ }) - - call defx#custom#column('filename', { - \ 'min_width': 80, - \ 'max_width': 80, - \ }) - call s:defx_open() -endfunction - -function! s:defx_open(...) abort - sil! au! FileExplorer * - if s:isdir(expand('%')) | bd | exe 'Defx' | endif -endfunction - -function! s:defx_my_settings() abort - " Define mappings - nnoremap - \ defx#do_action('open') - nnoremap c - \ defx#do_action('copy') - nnoremap m - \ defx#do_action('move') - nnoremap p - \ defx#do_action('paste') - nnoremap l - \ defx#do_action('open') - nnoremap E - \ defx#do_action('open', 'vsplit') - nnoremap P - \ defx#do_action('open', 'pedit') - nnoremap o - \ defx#do_action('open_or_close_tree') - nnoremap K - \ defx#do_action('new_directory') - nnoremap N - \ defx#do_action('new_file') - nnoremap M - \ defx#do_action('new_multiple_files') - nnoremap C - \ defx#do_action('toggle_columns', - \ 'mark:filename:type:size:time') - nnoremap S - \ defx#do_action('toggle_sort', 'time') - nnoremap d - \ defx#do_action('remove') - nnoremap r - \ defx#do_action('rename') - nnoremap ! - \ defx#do_action('execute_command') - nnoremap x - \ defx#do_action('execute_system') - nnoremap yy - \ defx#do_action('yank_path') - nnoremap . - \ defx#do_action('toggle_ignored_files') - nnoremap ; - \ defx#do_action('repeat') - nnoremap h - \ defx#do_action('cd', ['..']) - nnoremap ~ - \ defx#do_action('cd') - nnoremap q - \ defx#do_action('quit') - nnoremap - \ defx#do_action('toggle_select') . 'j' - nnoremap * - \ defx#do_action('toggle_select_all') - nnoremap