Merge branch 'master' of ssh://hectorone.homedns.org/home/mathieu/GitProject/config
This commit is contained in:
Mathieu Maret
commit
df90ec64f8
|
|
@ -1,3 +0,0 @@
|
|||
mmaret_ hello
|
||||
mmaret_ toto
|
||||
#openwide < gugus> mmaret: ben dis donc t'as pas de veine, moi ils m'ont filé un pc sous windows en me disant "tu fais ce que tu veux avec"
|
||||
41
.vimrc
41
.vimrc
|
|
@ -27,13 +27,6 @@
|
|||
"""""""""""
|
||||
" disable vi-compatible mode
|
||||
set nocompatible
|
||||
" to enable spellchecking :set speell"
|
||||
" c.f. :help spell
|
||||
" ]s search next misspelled
|
||||
" [s search previous misspelled
|
||||
" z= suggestion
|
||||
" trad files should be under /usr/share/vim/vimfiles/spell
|
||||
set spell spelllang=fr
|
||||
""""""""
|
||||
" SAVE "
|
||||
""""""""
|
||||
|
|
@ -179,7 +172,7 @@ if has("autocmd")
|
|||
" enable file type detection and do language-dependent indenting
|
||||
filetype plugin indent on
|
||||
" detect indentation see http://www.freehackers.org/Indent_Finder
|
||||
autocmd BufReadPost * execute system ('python ~/.vim/plugin/indent_finder.py --vim-output "' . expand('%') . '"' )
|
||||
autocmd BufReadPost * execute system ('python2 ~/.vim/plugin/indent_finder.py --vim-output "' . expand('%') . '"' )
|
||||
|
||||
else
|
||||
" auto-indent
|
||||
|
|
@ -233,6 +226,8 @@ set incsearch
|
|||
set showmatch
|
||||
" tenths of a second before blink matching brackets
|
||||
set mat=5
|
||||
" % match if/then/else/...
|
||||
runtime macros/matchit.vim
|
||||
" search word and list lines to jump with F3
|
||||
map <F3> [I:let nr = input("Which one: ") <Bar>execute "normal " . nr ."[\t"<CR>
|
||||
" go to declaration with F5
|
||||
|
|
@ -492,6 +487,7 @@ nmap <S-F10> zo<CR><CR>
|
|||
" Autoload folding
|
||||
"au BufWinEnter * silent loadview
|
||||
|
||||
|
||||
""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
"Omni-completion par CTRL-X_CTRL-O
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
|
|
@ -606,3 +602,32 @@ function! WhatFunction()
|
|||
endfunction
|
||||
|
||||
set statusline=%<%f\ %h%w%m%r%3.(\ %)%{fugitive#statusline()}%=%([%{Tlist_Get_Tagname_By_Line()}%{WhatFunction()}]%)%3.(\ %)%-14.(%l,%c%V%)\ %P
|
||||
|
||||
"""""""""""""""""""""""""""""""""""""""""""
|
||||
" Language
|
||||
"""""""""""""""""""""""""""""""""""""""""""
|
||||
" Using dictd
|
||||
function! Translate()
|
||||
let word = expand("<cword>")
|
||||
let output = system("echo -n $(dict -d eng-fra -f " .word. " 2> /dev/null | tail -n +3 | head -n -1 | sed '1s/$/:/;2,$s/$/;/')")
|
||||
if output != ""
|
||||
echohl WarningMsg
|
||||
echo output
|
||||
echohl None
|
||||
else
|
||||
echohl WarningMsg
|
||||
echo "No translation found"
|
||||
echohl None
|
||||
endif
|
||||
endfunction
|
||||
"default Leader is \
|
||||
nnoremap <silent> <Leader>t :call Translate()<cr>
|
||||
|
||||
" to enable spellchecking :set spell"
|
||||
" c.f. :help spell
|
||||
" ]s search next misspelled
|
||||
" [s search previous misspelled
|
||||
" z= suggestion
|
||||
" trad files should be under /usr/share/vim/vimfiles/spell
|
||||
set spell spelllang=en
|
||||
set nospell
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
#export http_proxy="http://grp-horus:3128"
|
||||
#export https_proxy="http://grp-horus:3128"
|
||||
#export ftp_proxy="http://grp-horus:3128"
|
||||
|
||||
#Java And Android Env
|
||||
export ECLIPSE_HOME=/home/mathieu/Outils/eclipse
|
||||
|
||||
#Perso Bin
|
||||
export PATH=$HOME/bin/bin:$HOME/bin:$PATH
|
||||
|
||||
export EDITOR=/usr/bin/vim
|
||||
#export http_proxy="http://grp-horus:3128"
|
||||
#export https_proxy="http://grp-horus:3128"
|
||||
#export ftp_proxy="http://grp-horus:3128"
|
||||
export ANDROID_DIR=/home/mathieu/android/android-sdk-linux_86
|
||||
export ANDROID_HOME=/home/mathieu/android/android-sdk-linux_86
|
||||
export ANDROID_SKD=/home/mathieu/android/android-sdk-linux/platforms/android-1.6
|
||||
#export PATH=$ANDROID_DIR/tools:$PATH
|
||||
export JAVA_HOME=/opt/java
|
||||
export CATALINA_HOME=/usr/share/tomcat6
|
||||
export PATH=$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ECLIPSE_HOME:$PATH
|
||||
|
||||
|
||||
|
||||
#emacsAndViKeys
|
||||
#bindkey -v
|
||||
#bindkey "^P" vi-up-line-or-history
|
||||
#bindkey "^N" vi-down-line-or-history
|
||||
#
|
||||
#bindkey "^[[1~" vi-beginning-of-line # Home
|
||||
#bindkey "^[[4~" vi-end-of-line # End
|
||||
#bindkey '^[[2~' beep # Insert
|
||||
#bindkey '^[[3~' delete-char # Del
|
||||
#bindkey '^[[5~' vi-backward-blank-word # Page Up
|
||||
#bindkey '^[[6~' vi-forward-blank-word # Page Down
|
||||
|
||||
#bindkey "^[[1~" vi-beginning-of-line # Home
|
||||
#bindkey "^[[4~" vi-end-of-line # End
|
||||
|
||||
|
||||
# make ctrl-r working
|
||||
#bindkey -M viins '^r' history-incremental-search-backward
|
||||
#bindkey -M vicmd '^r' history-incremental-search-backward
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# set keybinding for noUbuntu-noDebian
|
||||
|
||||
if [[ "$TERM" != emacs ]]; then
|
||||
[[ -z "$terminfo[kdch1]" ]] || bindkey -M emacs "$terminfo[kdch1]" delete-char
|
||||
[[ -z "$terminfo[khome]" ]] || bindkey -M emacs "$terminfo[khome]" beginning-of-line
|
||||
[[ -z "$terminfo[kend]" ]] || bindkey -M emacs "$terminfo[kend]" end-of-line
|
||||
[[ -z "$terminfo[kich1]" ]] || bindkey -M emacs "$terminfo[kich1]" overwrite-mode
|
||||
[[ -z "$terminfo[kdch1]" ]] || bindkey -M vicmd "$terminfo[kdch1]" vi-delete-char
|
||||
[[ -z "$terminfo[khome]" ]] || bindkey -M vicmd "$terminfo[khome]" vi-beginning-of-line
|
||||
[[ -z "$terminfo[kend]" ]] || bindkey -M vicmd "$terminfo[kend]" vi-end-of-line
|
||||
[[ -z "$terminfo[kich1]" ]] || bindkey -M vicmd "$terminfo[kich1]" overwrite-mode
|
||||
|
||||
[[ -z "$terminfo[cuu1]" ]] || bindkey -M viins "$terminfo[cuu1]" vi-up-line-or-history
|
||||
[[ -z "$terminfo[cuf1]" ]] || bindkey -M viins "$terminfo[cuf1]" vi-forward-char
|
||||
[[ -z "$terminfo[kcuu1]" ]] || bindkey -M viins "$terminfo[kcuu1]" vi-up-line-or-history
|
||||
[[ -z "$terminfo[kcud1]" ]] || bindkey -M viins "$terminfo[kcud1]" vi-down-line-or-history
|
||||
[[ -z "$terminfo[kcuf1]" ]] || bindkey -M viins "$terminfo[kcuf1]" vi-forward-char
|
||||
[[ -z "$terminfo[kcub1]" ]] || bindkey -M viins "$terminfo[kcub1]" vi-backward-char
|
||||
|
||||
# ncurses fogyatekos
|
||||
[[ "$terminfo[kcuu1]" == "^[O"* ]] && bindkey -M viins "${terminfo[kcuu1]/O/[}" vi-up-line-or-history
|
||||
[[ "$terminfo[kcud1]" == "^[O"* ]] && bindkey -M viins "${terminfo[kcud1]/O/[}" vi-down-line-or-history
|
||||
[[ "$terminfo[kcuf1]" == "^[O"* ]] && bindkey -M viins "${terminfo[kcuf1]/O/[}" vi-forward-char
|
||||
[[ "$terminfo[kcub1]" == "^[O"* ]] && bindkey -M viins "${terminfo[kcub1]/O/[}" vi-backward-char
|
||||
[[ "$terminfo[khome]" == "^[O"* ]] && bindkey -M viins "${terminfo[khome]/O/[}" beginning-of-line
|
||||
[[ "$terminfo[kend]" == "^[O"* ]] && bindkey -M viins "${terminfo[kend]/O/[}" end-of-line
|
||||
[[ "$terminfo[khome]" == "^[O"* ]] && bindkey -M emacs "${terminfo[khome]/O/[}" beginning-of-line
|
||||
[[ "$terminfo[kend]" == "^[O"* ]] && bindkey -M emacs "${terminfo[kend]/O/[}" end-of-line
|
||||
fi
|
||||
Loading…
Reference in New Issue