mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-08-05 16:48:38 +00:00
Merge branch 'master' of gitosis@majnematic.com:davesdots
This commit is contained in:
commit
f9db9de880
3 changed files with 12 additions and 7 deletions
|
@ -9,7 +9,7 @@ for dircolors in gdircolors dircolors ; do
|
||||||
done
|
done
|
||||||
|
|
||||||
# gimmie an editor, make it a nice vi clone
|
# gimmie an editor, make it a nice vi clone
|
||||||
for EDITOR in vim elvis vile nvi vi ; do
|
for EDITOR in vimx vim elvis vile nvi vi ; do
|
||||||
( command -v $EDITOR >/dev/null 2>&1 ) && break
|
( command -v $EDITOR >/dev/null 2>&1 ) && break
|
||||||
done
|
done
|
||||||
export EDITOR
|
export EDITOR
|
||||||
|
@ -18,6 +18,11 @@ export EDITOR
|
||||||
FCEDIT=$EDITOR
|
FCEDIT=$EDITOR
|
||||||
export FCEDIT
|
export FCEDIT
|
||||||
|
|
||||||
|
# vimx -> vim
|
||||||
|
if [ "${EDITOR}" = vimx ] ; then
|
||||||
|
alias vim=vimx
|
||||||
|
fi
|
||||||
|
|
||||||
# aliases
|
# aliases
|
||||||
alias cd..='cd ..'
|
alias cd..='cd ..'
|
||||||
|
|
||||||
|
|
10
vimrc
10
vimrc
|
@ -249,10 +249,12 @@ map Y y$
|
||||||
vmap K k
|
vmap K k
|
||||||
|
|
||||||
" :W and :Q are annoying
|
" :W and :Q are annoying
|
||||||
command! -nargs=0 -bang Q q<bang>
|
if has('user_commands')
|
||||||
command! -nargs=0 -bang W w<bang>
|
command! -nargs=0 -bang Q q<bang>
|
||||||
command! -nargs=0 -bang WQ wq<bang>
|
command! -nargs=0 -bang W w<bang>
|
||||||
command! -nargs=0 -bang Wq wq<bang>
|
command! -nargs=0 -bang WQ wq<bang>
|
||||||
|
command! -nargs=0 -bang Wq wq<bang>
|
||||||
|
endif
|
||||||
|
|
||||||
" just continue
|
" just continue
|
||||||
nmap K K<cr>
|
nmap K K<cr>
|
||||||
|
|
|
@ -41,8 +41,6 @@ case $TERM in
|
||||||
bindkey '\e[1~' beginning-of-line
|
bindkey '\e[1~' beginning-of-line
|
||||||
bindkey '\e[4~' end-of-line
|
bindkey '\e[4~' end-of-line
|
||||||
bindkey '\e[3~' delete-char
|
bindkey '\e[3~' delete-char
|
||||||
bindkey '\eOC' emacs-forward-word
|
|
||||||
bindkey '\eOD' emacs-backward-word
|
|
||||||
;;
|
;;
|
||||||
*rxvt*|Eterm|aterm)
|
*rxvt*|Eterm|aterm)
|
||||||
bindkey '\e[c' emacs-forward-word
|
bindkey '\e[c' emacs-forward-word
|
||||||
|
|
Loading…
Add table
Reference in a new issue