Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ma6174 committed May 10, 2013
1 parent 0551038 commit b122093
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .vimrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"golang
"
"Processing... % (ctrl+c to stop)
let g:fencview_autodetect=0
set rtp+=$GOROOT/misc/vim
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" 显示相关
Expand Down Expand Up @@ -70,6 +71,9 @@ au BufRead,BufNewFile *.{go} set filetype=go
nmap md :!~/.vim/markdown.pl % > %.html <CR><CR>
nmap fi :!firefox %.html & <CR><CR>
"将tab替换为空格
nmap tt :%s/\t/ /g<CR>


"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Expand Down Expand Up @@ -132,8 +136,9 @@ map! <C-Z> <Esc>zzi
map! <C-O> <C-Y>,
map <C-A> ggVG$"+y
map <F12> gg=G
imap <C-k> <C-y>,
" 选中状态下 Ctrl+c 复制
map <C-v> "*pa
"map <C-v> "*pa
imap <C-v> <Esc>"*pa
imap <C-a> <Esc>^
imap <C-e> <Esc>$
Expand Down
22 changes: 20 additions & 2 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ FINISH="%{$terminfo[sgr0]%}"

#命令提示符
RPROMPT=$(echo "$RED%D %T$FINISH")
PROMPT=$(echo "~~$GREEN%/$_YELLOW>>$FINISH ")
PROMPT=$(echo "@$GREEN%/$_YELLOW\$ $FINISH")

#RPROMPT=$(echo "$RED%D %T$FINISH")
#PROMPT=$(echo "$CYAN%n@$YELLOW%M:$GREEN%/$_YELLOW>$FINISH ")
Expand All @@ -26,7 +26,11 @@ preexec () { print -Pn "\e]0;%n@%M//%/\ $1\a" }
;;
esac
#}}}


#python startup
export PYTHONSTARTUP="/home/ma6174/.pythonstartup"

#current path-directories
#编辑器
export EDITOR=vim
#输入法
Expand Down Expand Up @@ -244,8 +248,21 @@ alias y='yaourt'
alias h='htop'
alias vim='sudo vim'
alias sshacm='ssh [email protected]'
alias sshdb='ssh [email protected] -p 23'
alias sshsys='ssh [email protected] -X'
alias fqr="ssh -TfnN -D 7071 [email protected]"
alias fq='ssh -TfnN -D 7070 -p 3843 [email protected]'
alias l='ls'
alias b='bpython'
alias pi='ssh [email protected]'
alias sl='sl -e'
alias fileftp='python -m SimpleHTTPServer'
alias r='ranger'
alias i='sudo apt-get install -y'
alias gita='git add . && git commit -a'
alias t='tmux'
alias ta='tmux a -t 0'
alias news="newsbeuter"

#[Esc][h] man 当前命令时,显示简短说明
alias run-help >&/dev/null && unalias run-help
Expand Down Expand Up @@ -339,3 +356,4 @@ check-cmd-self-insert() { zle .self-insert && recolor-cmd }

zle -N self-insert check-cmd-self-insert
zle -N backward-delete-char check-cmd-backward-delete-char
export PATH=$HOME/.cabal/bin:$PATH
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
- clone bundle 程序:`git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle`
- 打开vim并执行bundle程序`:BundleInstall`

## 2013年5月10日更新

- 修复关闭html一直提示"Processing... % (ctrl+c to stop)bug
- 修改zencoding快捷键,`ctrl+k`展开
- 增加javascript插件

## 2013年4月3日更新

1. 完善安装方法,修复bundle问题
Expand Down
1 change: 1 addition & 0 deletions bundle/Better-Javascript-Indentation
Submodule Better-Javascript-Indentation added at c624ed
1 change: 1 addition & 0 deletions bundle/Javascript-Indentation
Submodule Javascript-Indentation added at 3e5a67
1 change: 1 addition & 0 deletions bundle/javascript.vim
Submodule javascript.vim added at ba362a

0 comments on commit b122093

Please sign in to comment.