Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:xbot/dotfiles

  • Loading branch information...
commit 5f45ea0d977a7ecab803aa02904804d8ca01c027 2 parents ca5b2cd + 36562aa
@xbot authored
Showing with 10 additions and 4 deletions.
  1. +3 −1 bashrc_cygwin
  2. +7 −3 vimrc
View
4 bashrc_cygwin
@@ -1,5 +1,6 @@
# To pick up the latest recommended .bashrc content,
# look in /etc/defaults/etc/skel/.bashrc
+source ~/xbot/mavnn-mintty-solarized/sol.dark
# Modifying /etc/skel/.bashrc directly will prevent
# setup from updating it.
@@ -105,7 +106,7 @@ alias df='df -h'
alias du='du -h'
# Git aliases
-alias status='git status'
+alias gst='git status'
alias pull='git pull'
alias push='git push'
alias commit='git commit'
@@ -138,6 +139,7 @@ alias rr='rm -rf'
alias upgrade='/cygdrive/d/cygwin/setup.exe'
alias showd='ls /cygdrive'
alias v='vim'
+alias vi='vim'
alias c='cat'
alias reload='. ~/.bashrc'
View
10 vimrc
@@ -188,6 +188,7 @@ else
set background=dark
"colorscheme diablo3
"colorscheme jellybeans
+ let g:solarized_termcolors=256
colorscheme solarized
endif
"}}}
@@ -337,7 +338,7 @@ let g:DirDiffExcludes = "CVS,*.class,*.exe,.*.swp,.svn,.git,assets,tags"
" Colorizer
let g:colorizer_auto_filetype='css,html'
-" minibufexpl
+" Minibufexpl
let g:miniBufExplSplitBelow=0
"}}}
@@ -389,6 +390,9 @@ au FileType vim set commentstring=\"%s
" Python
au FileType python set fdm=indent
+" SQL
+au FileType sql set fdm=manual
+
" Plain text
au BufNewFile,BufRead *.txt set wrap
" Dokuwiki
@@ -541,9 +545,9 @@ let g:debuggerMapDefaultKeys=2
let g:debuggerPort = 9001
" 查找與替換
-nmap <leader>ff yiw/<C-R>"\C
+nmap <leader>ff yiw/\<<C-R>"\>\C
vmap <leader>ff y/<C-R>=XEscapeRegex(@")<cr>\C
-nmap <leader>rr yiw:%s/<C-R>"\C//g<LEFT><LEFT>
+nmap <leader>rr yiw:%s/\<<C-R>"\>\C//g<LEFT><LEFT>
vmap <leader>rr y:%s/<C-R>=XEscapeRegex(@")<cr>\C//g<LEFT><LEFT>
" 编码转换
Please sign in to comment.
Something went wrong with that request. Please try again.