Merge branch 'master' into wsr
This commit is contained in:
commit
fd023493d4
5
.vimrc
5
.vimrc
|
@ -42,3 +42,8 @@ autocmd FileType perl syntax on
|
||||||
autocmd FileType go set sw=8
|
autocmd FileType go set sw=8
|
||||||
autocmd FileType go set tw=79
|
autocmd FileType go set tw=79
|
||||||
autocmd FileType go set noexpandtab
|
autocmd FileType go set noexpandtab
|
||||||
|
|
||||||
|
autocmd BufRead,BufNewFile *.ts set filetype=javascript
|
||||||
|
autocmd FileType javascript set sw=2
|
||||||
|
|
||||||
|
autocmd FileType html set sw=2
|
||||||
|
|
2
.zshrc
2
.zshrc
|
@ -28,7 +28,7 @@ then
|
||||||
alias ack=$ack
|
alias ack=$ack
|
||||||
fi
|
fi
|
||||||
alias darkbg='xtermcontrol --bg "#000" --fg "#FFF" --highlight="#00F"; export BG=dark'
|
alias darkbg='xtermcontrol --bg "#000" --fg "#FFF" --highlight="#00F"; export BG=dark'
|
||||||
alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light'
|
alias lightbg='xtermcontrol --bg "#F0F0F0" --fg "#000" --highlight="#0FF"; export BG=light'
|
||||||
alias defaultbg='. ~/.zxtermcolors'
|
alias defaultbg='. ~/.zxtermcolors'
|
||||||
alias ag='ag --color-path "34;47"'
|
alias ag='ag --color-path "34;47"'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue