Skip to content

Commit

Permalink
v2022-03-17.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Arondight committed Mar 17, 2022
1 parent 0e6fcf7 commit 0b0ed27
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 23 deletions.
9 changes: 9 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
v2022-03-17.2
* vim:
增加了插件 fatih/vim-go
* zsh:
移除了插件 go 和 zsh_reload
别名改动
GOPATH 改动
PERL5LIB 改动

v2022-03-17
* all:
格式化文档
Expand Down
27 changes: 14 additions & 13 deletions vim/.vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,21 @@ filetype off " required
set rtp+=~/.vim/bundle/Vundle.vim " Vundle 路径
call vundle#begin() " call vundle#begin('~/some/path/here')
" 插件列表 {
Plugin 'Matt-Deacalion/vim-systemd-syntax'
Plugin 'Rip-Rip/clang_complete'
Plugin 'Shougo/vimproc.vim'
Plugin 'Shougo/vimshell.vim'
Plugin 'SirVer/ultisnips'
Plugin 'Valloric/ListToggle'
Plugin 'Valloric/MatchTagAlways'
"Plugin 'Valloric/YouCompleteMe'
"Plugin 'Yggdroot/indentLine'
Plugin 'airblade/vim-gitgutter'
Plugin 'bling/vim-airline'
Plugin 'briancollins/vim-jst'
Plugin 'chrisbra/vim-diff-enhanced'
Plugin 'easymotion/vim-easymotion'
Plugin 'fatih/vim-go'
Plugin 'flazz/vim-colorschemes'
Plugin 'gmarik/Vundle.vim'
Plugin 'godlygeek/tabular'
Expand All @@ -35,8 +45,8 @@ Plugin 'itchyny/calendar.vim'
Plugin 'jlanzarotta/bufexplorer'
Plugin 'kien/rainbow_parentheses.vim'
Plugin 'lilydjwg/colorizer'
Plugin 'lzap/vim-selinux'
Plugin 'majutsushi/tagbar'
Plugin 'Matt-Deacalion/vim-systemd-syntax'
Plugin 'mbbill/fencview'
Plugin 'mileszs/ack.vim'
Plugin 'morhetz/gruvbox'
Expand All @@ -45,34 +55,25 @@ Plugin 'ntpeters/vim-better-whitespace'
Plugin 'octol/vim-cpp-enhanced-highlight'
Plugin 'pangloss/vim-javascript'
"Plugin 'plasticboy/vim-markdown' " godlygeek/tabular
Plugin 'Rip-Rip/clang_complete'
Plugin 'scrooloose/nerdcommenter'
Plugin 'scrooloose/nerdtree'
"Plugin 'scrooloose/syntastic'
Plugin 'Shougo/vimproc.vim'
Plugin 'Shougo/vimshell.vim'
Plugin 'SirVer/ultisnips'
Plugin 'terryma/vim-multiple-cursors'
"Plugin 'tomasr/molokai'
"Plugin 'uguu-org/vim-matrix-screensaver'
Plugin 'Valloric/ListToggle'
Plugin 'Valloric/MatchTagAlways'
"Plugin 'Valloric/YouCompleteMe'
Plugin 'vim-perl/vim-perl'
Plugin 'vim-scripts/Align'
"Plugin 'vim-scripts/DrawIt'
Plugin 'vim-scripts/TaskList.vim'
Plugin 'vim-scripts/TeTrIs.vim'
Plugin 'vim-scripts/a.vim'
"Plugin 'vim-scripts/bad-apple'
Plugin 'vim-scripts/c.vim'
"Plugin 'vim-scripts/DrawIt'
Plugin 'vim-scripts/mru.vim'
Plugin 'vim-scripts/spellcheck.vim'
"Plugin 'vim-scripts/taglist.vim'
Plugin 'vim-scripts/TaskList.vim'
Plugin 'vim-scripts/TeTrIs.vim'
Plugin 'wakatime/vim-wakatime'
"Plugin 'yonchu/accelerated-smooth-scroll'
"Plugin 'Yggdroot/indentLine'
Plugin 'lzap/vim-selinux'
" }
call vundle#end() " 插件列表必须在此之前结束
filetype plugin indent on
Expand Down
14 changes: 14 additions & 0 deletions vim/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ function initClangComplete ()
return 0
}

# vim-go
function initVimGo ()
{
local _vim_go_dir="${PLUGINDIR}/vim-go"

if [[ -d "$_clang_complete_dir" ]]
then
vim -c 'GoInstallBinaries' -c 'qa'
fi

return 0
}

# color_coded
function initColorCoded ()
{
Expand Down Expand Up @@ -199,6 +212,7 @@ function initYCM ()
initPlugins || exit $?
initVimproc
initClangComplete
initVimGo
#initColorCoded
#initLibtinfo
#initSyntastic
Expand Down
7 changes: 4 additions & 3 deletions zsh/.zsh/alias/alias.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# SOURCE ME!!!
# ==============================================================================

# Girlfriend
alias girlfriend='valgrind'
alias girlfriend-say='girlfriend --leak-check=full --show-reachable=yes --trace-children=yes'
# src
alias src="source ${HOME}/.zshrc"
# valgrind
alias valgrind='girlfriend --leak-check=full --show-reachable=yes --trace-children=yes'
# 文本处理 {
alias a='env awk'
alias c='env cat'
Expand Down
4 changes: 2 additions & 2 deletions zsh/.zsh/path/cpan_path.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# SOURCE ME!!!
# ==============================================================================

#export PERL_LOCAL_LIB_ROOT="${HOME}/lib/perl5"
#export PERL5LIB="${PERL_LOCAL_LIB_ROOT}/lib/perl5"
#export PERL_LOCAL_LIB_ROOT="${HOME}/.lib/perl5"
#export PERL5LIB="${PERL_LOCAL_LIB_ROOT}/.lib/perl5"
#export PERL_MB_OPT="--install_base \"${PERL_LOCAL_LIB_ROOT}\""
#export PERL_MM_OPT="INSTALL_BASE=${PERL_LOCAL_LIB_ROOT}"
#export PATH="${PERL_LOCAL_LIB_ROOT}/bin:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion zsh/.zsh/path/go_path.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# SOURCE ME!!!
# ==============================================================================

export GOPATH="${HOME}/lib/go"
export GOPATH="${HOME}/.lib/go"
export PATH="${GOPATH}/bin:${PATH}"

8 changes: 4 additions & 4 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ function oh_my_zsh_conf ()
# ==============================================================================
# 官方通用插件
plugins=(
'battery' 'colorize' 'command-not-found' 'common-aliases' 'copydir' 'copyfile'
'dircycle' 'dirhistory' 'dirpersist' 'encode64' 'gnu-utils'
'battery' 'colorize' 'command-not-found' 'common-aliases' 'copypath'
'copyfile' 'dircycle' 'dirhistory' 'dirpersist' 'encode64' 'gnu-utils'
'history-substring-search' 'jump' 'pass' 'per-directory-history' 'perl'
'systemadmin' 'textmate' 'themes' 'torrent' 'urltools' 'wd' 'web-search'
'zsh-navigation-tools' 'zsh_reload'
'zsh-navigation-tools'
)
# 选择性加载
existcmd 'adb' && plugins+=('adb' 'repo')
Expand All @@ -50,7 +50,7 @@ function oh_my_zsh_conf ()
existcmd 'fbterm' && plugins+='fbterm'
existcmd 'firewalld' && plugins+='firewalld'
existcmd 'git' && plugins+=('git' 'github' 'git-prompt' 'git-extras')
existcmd 'go' && plugins+=('go' 'golang')
existcmd 'go' && plugins+=('golang')
existcmd 'gvim' && plugins+='vim-interaction'
existcmd 'nmap' && plugins+='nmap'
existcmd 'node' && plugins+='node'
Expand Down
6 changes: 6 additions & 0 deletions zsh/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ WORKDIR=$(dirname $(readlink -f $0))
ZSHSRC="${WORKDIR}/.zsh"
ZSHRCDEST="${HOME}/.zshrc"
ZSHDEST="${HOME}/.zsh"
LIBDIR="${HOME}/.lib"

if [[ -e $ZSHRCDEST ]]
then
Expand Down Expand Up @@ -45,6 +46,11 @@ WORKDIR=$(dirname $(readlink -f $0))
ln -sf $ZSHSRC $ZSHDEST
fi

if [[ ! -d $LIBDIR ]]
then
mkdir -pv $LIBDIR
fi

echo 'done'

exit 0
Expand Down

0 comments on commit 0b0ed27

Please sign in to comment.