Merge branch 'master' of github.com:nojhan/dotfiles
This commit is contained in:
Johann Dreo
commit
391ebbe608
24 changed files with 428 additions and 46 deletions
7
.bashrc
7
.bashrc
|
|
@ -118,6 +118,10 @@ function md() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# use up/down to search history, matching the current line start
|
||||||
|
bind '"\e[A": history-search-backward'
|
||||||
|
bind '"\e[B": history-search-forward'
|
||||||
|
|
||||||
#############
|
#############
|
||||||
# Processes #
|
# Processes #
|
||||||
#############
|
#############
|
||||||
|
|
@ -144,7 +148,7 @@ function repeat()
|
||||||
}
|
}
|
||||||
|
|
||||||
# default editor
|
# default editor
|
||||||
export EDITOR='gvim'
|
export EDITOR='gvim --nofork'
|
||||||
|
|
||||||
# print a vim fortune at startup
|
# print a vim fortune at startup
|
||||||
#/usr/games/fortune vimtips
|
#/usr/games/fortune vimtips
|
||||||
|
|
@ -215,6 +219,7 @@ HISTTIMEFORMAT='%F %T '
|
||||||
alias bepo="setxkbmap -layout fr -variant bepo -option"
|
alias bepo="setxkbmap -layout fr -variant bepo -option"
|
||||||
|
|
||||||
# Super nice prompt
|
# Super nice prompt
|
||||||
|
source ~/.liquidpromptrc
|
||||||
source ~/.liquidprompt
|
source ~/.liquidprompt
|
||||||
|
|
||||||
# Added by autojump install.sh
|
# Added by autojump install.sh
|
||||||
|
|
|
||||||
21
.gitconfig
Normal file
21
.gitconfig
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
[user]
|
||||||
|
name = nojhan
|
||||||
|
email = nojhan@nojhan.net
|
||||||
|
[alias]
|
||||||
|
up = pull origin
|
||||||
|
st = status
|
||||||
|
di = diff
|
||||||
|
co = checkout
|
||||||
|
# create branch
|
||||||
|
cb = checkout -b
|
||||||
|
ci = commit -a -v
|
||||||
|
br = branch
|
||||||
|
sta = stash
|
||||||
|
[pager]
|
||||||
|
# use less as pager
|
||||||
|
# -R is necessary to display colors in less
|
||||||
|
# the '+' calls a command at start, that will jump to the first diff section
|
||||||
|
# then, you just have to type 'n' to iterate over diff sections
|
||||||
|
diff = less -R +'/^\\@\\@\\s'
|
||||||
|
[color]
|
||||||
|
ui = auto
|
||||||
42
.gitmodules
vendored
Normal file
42
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
[submodule ".vim/bundle/vim-pathogen"]
|
||||||
|
path = .vim/bundle/vim-pathogen
|
||||||
|
url = https://github.com/tpope/vim-pathogen.git
|
||||||
|
[submodule ".vim/bundle/nerdtree"]
|
||||||
|
path = .vim/bundle/nerdtree
|
||||||
|
url = https://github.com/scrooloose/nerdtree.git
|
||||||
|
[submodule ".vim/bundle/vim-statline"]
|
||||||
|
path = .vim/bundle/vim-statline
|
||||||
|
url = https://github.com/millermedeiros/vim-statline.git
|
||||||
|
[submodule ".vim/bundle/supertab"]
|
||||||
|
path = .vim/bundle/supertab
|
||||||
|
url = https://github.com/ervandew/supertab.git
|
||||||
|
[submodule ".vim/bundle/Command-T"]
|
||||||
|
path = .vim/bundle/Command-T
|
||||||
|
url = https://github.com/wincent/Command-T.git
|
||||||
|
[submodule ".vim/bundle/tlib_vim"]
|
||||||
|
path = .vim/bundle/tlib_vim
|
||||||
|
url = https://github.com/tomtom/tlib_vim.git
|
||||||
|
[submodule ".vim/bundle/tcomment_vim"]
|
||||||
|
path = .vim/bundle/tcomment_vim
|
||||||
|
url = https://github.com/tomtom/tcomment_vim.git
|
||||||
|
[submodule ".vim/bundle/vim-eunuch"]
|
||||||
|
path = .vim/bundle/vim-eunuch
|
||||||
|
url = https://github.com/tpope/vim-eunuch.git
|
||||||
|
[submodule ".vim/bundle/vim-surround"]
|
||||||
|
path = .vim/bundle/vim-surround
|
||||||
|
url = https://github.com/tpope/vim-surround.git
|
||||||
|
[submodule ".vim/bundle/rainbow_parentheses.vim"]
|
||||||
|
path = .vim/bundle/rainbow_parentheses.vim
|
||||||
|
url = https://github.com/kien/rainbow_parentheses.vim.git
|
||||||
|
[submodule ".vim/bundle/gundo"]
|
||||||
|
path = .vim/bundle/gundo
|
||||||
|
url = https://github.com/sjl/gundo.vim.git
|
||||||
|
[submodule ".vim/bundle/minibufexpl"]
|
||||||
|
path = .vim/bundle/minibufexpl
|
||||||
|
url = https://github.com/fholgado/minibufexpl.vim.git
|
||||||
|
[submodule ".vim/bundle/tagbar"]
|
||||||
|
path = .vim/bundle/tagbar
|
||||||
|
url = https://github.com/majutsushi/tagbar.git
|
||||||
|
[submodule ".vim/vim-pathogen"]
|
||||||
|
path = .vim/vim-pathogen
|
||||||
|
url = https://github.com/tpope/vim-pathogen.git
|
||||||
1
.vim/bundle/Command-T
Submodule
1
.vim/bundle/Command-T
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 07087e16ba8fe0a87b1d1ccd03e158a0157dc1f8
|
||||||
1
.vim/bundle/gundo
Submodule
1
.vim/bundle/gundo
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 4c376a8061fa335228da420937ce385b847dd56a
|
||||||
1
.vim/bundle/minibufexpl
Submodule
1
.vim/bundle/minibufexpl
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit d92c8b01248d612444829001b3e081629d37a1aa
|
||||||
1
.vim/bundle/nerdtree
Submodule
1
.vim/bundle/nerdtree
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 40d05ace57fb51cc2c2b2e9eb81c4832ed291630
|
||||||
1
.vim/bundle/rainbow_parentheses.vim
Submodule
1
.vim/bundle/rainbow_parentheses.vim
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 874367f41275d8dd43204f0c491157accc8b5f03
|
||||||
1
.vim/bundle/supertab
Submodule
1
.vim/bundle/supertab
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit cb8a2979afca175ddc3c126c7b4a2610bd32a6f5
|
||||||
1
.vim/bundle/tagbar
Submodule
1
.vim/bundle/tagbar
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit feebffcd2a3ac171bd7a20b512567a19d94b1ea0
|
||||||
1
.vim/bundle/tcomment_vim
Submodule
1
.vim/bundle/tcomment_vim
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 8e772866c0259de0b2f1534a37ec202386306e5b
|
||||||
1
.vim/bundle/tlib_vim
Submodule
1
.vim/bundle/tlib_vim
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 58122ab00417416757d62867f785d5a96021c0d0
|
||||||
1
.vim/bundle/vim-eunuch
Submodule
1
.vim/bundle/vim-eunuch
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 4abf1f58614fc6b4c20bb247db59469a9a52ff9b
|
||||||
1
.vim/bundle/vim-pathogen
Submodule
1
.vim/bundle/vim-pathogen
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f195ac5e402a1e7d0f75322558da36245dde59d6
|
||||||
1
.vim/bundle/vim-statline
Submodule
1
.vim/bundle/vim-statline
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 45d369eff6e2c5441ba21918825a8c215a44a951
|
||||||
1
.vim/bundle/vim-surround
Submodule
1
.vim/bundle/vim-surround
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 02199ea0080d744ec76b79d74ce56d51d25cf7ae
|
||||||
1
.vim/spell/en.utf-8.add
Normal file
1
.vim/spell/en.utf-8.add
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
french
|
||||||
BIN
.vim/spell/en.utf-8.add.spl
Normal file
BIN
.vim/spell/en.utf-8.add.spl
Normal file
Binary file not shown.
11
.vim/spell/fr.utf-8.add
Normal file
11
.vim/spell/fr.utf-8.add
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
algorithmie
|
||||||
|
anti
|
||||||
|
Thales
|
||||||
|
replanification
|
||||||
|
middleware
|
||||||
|
Petri
|
||||||
|
→
|
||||||
|
GPS
|
||||||
|
multi
|
||||||
|
CPU
|
||||||
|
multi
|
||||||
BIN
.vim/spell/fr.utf-8.add.spl
Normal file
BIN
.vim/spell/fr.utf-8.add.spl
Normal file
Binary file not shown.
BIN
.vim/spell/fr.utf-8.spl
Normal file
BIN
.vim/spell/fr.utf-8.spl
Normal file
Binary file not shown.
290
.vim/syntax/Wikipedia.vim
Normal file
290
.vim/syntax/Wikipedia.vim
Normal file
|
|
@ -0,0 +1,290 @@
|
||||||
|
" Wikipedia syntax file for Vim
|
||||||
|
" Published on Wikipedia in 2003-04 and declared authorless.
|
||||||
|
"
|
||||||
|
" Based on the HTML syntax file. Probably too closely based, in fact. There
|
||||||
|
" may well be name collisions everywhere, but ignorance is bliss, so they say.
|
||||||
|
"
|
||||||
|
" To do: plug-in support for downloading and uploading to the server.
|
||||||
|
|
||||||
|
if !exists("main_syntax")
|
||||||
|
if version < 600
|
||||||
|
syntax clear
|
||||||
|
elseif exists("b:current_syntax")
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
let main_syntax = 'html'
|
||||||
|
endif
|
||||||
|
|
||||||
|
if version < 508
|
||||||
|
command! -nargs=+ HtmlHiLink hi link <args>
|
||||||
|
else
|
||||||
|
command! -nargs=+ HtmlHiLink hi def link <args>
|
||||||
|
endif
|
||||||
|
|
||||||
|
syn case ignore
|
||||||
|
|
||||||
|
syn spell toplevel
|
||||||
|
set spell
|
||||||
|
|
||||||
|
" tags
|
||||||
|
syn region htmlString contained start=+"+ end=+"+ contains=htmlSpecialChar
|
||||||
|
syn region htmlString contained start=+'+ end=+'+ contains=htmlSpecialChar
|
||||||
|
syn match htmlValue contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1
|
||||||
|
syn region htmlEndTag start=+</+ end=+>+ contains=htmlTagN
|
||||||
|
|
||||||
|
"syn region htmlTag start=+<[^/]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,@htmlArgCluster
|
||||||
|
syn region htmlTag start=+<[^/]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
|
||||||
|
|
||||||
|
syn match htmlTagN contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
|
||||||
|
syn match htmlTagN contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
|
||||||
|
syn match htmlTagError contained "[^>]<"ms=s+1
|
||||||
|
|
||||||
|
" allowed tag names
|
||||||
|
syn keyword htmlTagName contained b i u font big small sub sup
|
||||||
|
syn keyword htmlTagName contained h1 h2 h3 h4 h5 h6 cite code em s strike strong tt var div center
|
||||||
|
syn keyword htmlTagName contained blockquote ol ul dl table caption pre
|
||||||
|
syn keyword htmlTagName contained ruby rt rb rp
|
||||||
|
syn keyword htmlTagName contained br p hr li dt dd
|
||||||
|
syn keyword htmlTagName contained table tr td th div blockquote ol ul
|
||||||
|
syn keyword htmlTagName contained dl font big small sub sup
|
||||||
|
syn keyword htmlTagName contained td th tr
|
||||||
|
syn keyword htmlTagName contained nowiki math
|
||||||
|
|
||||||
|
" allowed arg names
|
||||||
|
syn keyword htmlArg contained title align lang dir width height
|
||||||
|
syn keyword htmlArg contained bgcolor clear noshade
|
||||||
|
syn keyword htmlArg contained cite size face color
|
||||||
|
syn keyword htmlArg contained type start value compact
|
||||||
|
syn keyword htmlArg contained summary width border frame rules
|
||||||
|
syn keyword htmlArg contained cellspacing cellpadding valign char
|
||||||
|
syn keyword htmlArg contained charoff colgroup col span abbr axis
|
||||||
|
syn keyword htmlArg contained headers scope rowspan colspan
|
||||||
|
syn keyword htmlArg contained id class name style
|
||||||
|
|
||||||
|
" special characters
|
||||||
|
syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
|
||||||
|
|
||||||
|
" comments
|
||||||
|
syn region htmlComment start=+<!+ end=+>+ contains=htmlCommentPart,htmlCommentError
|
||||||
|
syn match htmlCommentError contained "[^><!]"
|
||||||
|
syn region htmlCommentPart contained start=+--+ end=+--\s*+ contains=@htmlPreProc
|
||||||
|
syn region htmlComment start=+<!DOCTYPE+ keepend end=+>+
|
||||||
|
|
||||||
|
" HTML formatting
|
||||||
|
syn cluster htmlTop contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlComment,htmlLink
|
||||||
|
|
||||||
|
syn region htmlBold start="<b\>" end="</b>"me=e-4 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
|
||||||
|
syn region htmlBold start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
|
||||||
|
syn region htmlBoldUnderline contained start="<u\>" end="</u>"me=e-4 contains=@htmlTop,htmlBoldUnderlineItalic
|
||||||
|
syn region htmlBoldItalic contained start="<i\>" end="</i>"me=e-4 contains=@htmlTop,htmlBoldItalicUnderline
|
||||||
|
syn region htmlBoldItalic contained start="<em\>" end="</em>"me=e-5 contains=@htmlTop,htmlBoldItalicUnderline
|
||||||
|
syn region htmlBoldUnderlineItalic contained start="<i\>" end="</i>"me=e-4 contains=@htmlTop
|
||||||
|
syn region htmlBoldUnderlineItalic contained start="<em\>" end="</em>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlBoldItalicUnderline contained start="<u\>" end="</u>"me=e-4 contains=@htmlTop,htmlBoldUnderlineItalic
|
||||||
|
|
||||||
|
syn region htmlUnderline start="<u\>" end="</u>"me=e-4 contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic
|
||||||
|
syn region htmlUnderlineBold contained start="<b\>" end="</b>"me=e-4 contains=@htmlTop,htmlUnderlineBoldItalic
|
||||||
|
syn region htmlUnderlineBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlUnderlineBoldItalic
|
||||||
|
syn region htmlUnderlineItalic contained start="<i\>" end="</i>"me=e-4 contains=@htmlTop,htmUnderlineItalicBold
|
||||||
|
syn region htmlUnderlineItalic contained start="<em\>" end="</em>"me=e-5 contains=@htmlTop,htmUnderlineItalicBold
|
||||||
|
syn region htmlUnderlineItalicBold contained start="<b\>" end="</b>"me=e-4 contains=@htmlTop
|
||||||
|
syn region htmlUnderlineItalicBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop
|
||||||
|
syn region htmlUnderlineBoldItalic contained start="<i\>" end="</i>"me=e-4 contains=@htmlTop
|
||||||
|
syn region htmlUnderlineBoldItalic contained start="<em\>" end="</em>"me=e-5 contains=@htmlTop
|
||||||
|
|
||||||
|
syn region htmlItalic start="<i\>" end="</i>"me=e-4 contains=@htmlTop,htmlItalicBold,htmlItalicUnderline
|
||||||
|
syn region htmlItalic start="<em\>" end="</em>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlItalicBold contained start="<b\>" end="</b>"me=e-4 contains=@htmlTop,htmlItalicBoldUnderline
|
||||||
|
syn region htmlItalicBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlItalicBoldUnderline
|
||||||
|
syn region htmlItalicBoldUnderline contained start="<u\>" end="</u>"me=e-4 contains=@htmlTop
|
||||||
|
syn region htmlItalicUnderline contained start="<u\>" end="</u>"me=e-4 contains=@htmlTop,htmlItalicUnderlineBold
|
||||||
|
syn region htmlItalicUnderlineBold contained start="<b\>" end="</b>"me=e-4 contains=@htmlTop
|
||||||
|
syn region htmlItalicUnderlineBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop
|
||||||
|
|
||||||
|
syn region htmlH1 start="<h1\>" end="</h1>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlH2 start="<h2\>" end="</h2>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlH3 start="<h3\>" end="</h3>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlH4 start="<h4\>" end="</h4>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlH5 start="<h5\>" end="</h5>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlH6 start="<h6\>" end="</h6>"me=e-5 contains=@htmlTop
|
||||||
|
syn region htmlHead start="<head\>" end="</head>"me=e-7 end="<body\>"me=e-5 end="<h[1-6]\>"me=e-3 contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,htmlTitle,cssStyle
|
||||||
|
syn region htmlTitle start="<title\>" end="</title>"me=e-8 contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment
|
||||||
|
|
||||||
|
" wiki formatting
|
||||||
|
"syn region wikiItalic start="\([^']\|\_^\)''[^']"hs=s+1 end="[^']''\([^']\|\_$\)"he=e-1 skip="<nowiki>.*</nowiki>" contains=wikiLink,wikiItalicBold
|
||||||
|
"syn region wikiBold start="\([^']\|\_^\)'''[^']" end="[^']'''\([^']\|\_$\)" skip="<nowiki>.*</nowiki>" contains=wikiLink,wikiBoldItalic
|
||||||
|
|
||||||
|
"syn region wikiBoldItalic contained start="\([^']\|\_^\)''[^']" end="[^']''\([^']\|\_$\)" skip="<nowiki>.*</nowiki>" contains=wikiLink
|
||||||
|
"syn region wikiItalicBold contained start="\([^']\|\_^\)'''[^']" end="[^']'''\([^']\|\_$\)" skip="<nowiki>.*</nowiki>" contains=wikiLink
|
||||||
|
|
||||||
|
"syn region wikiBoldAndItalic start="'''''" end="'''''" skip="<nowiki>.*</nowiki>" contains=wikiLink
|
||||||
|
|
||||||
|
syn region wikiItalic start=+'\@<!'''\@!+ end=+''+ contains=@Spell,wikiLink,wikiItalicBold
|
||||||
|
syn region wikiBold start=+'''+ end=+'''+ contains=@Spell,wikiLink,wikiBoldItalic
|
||||||
|
syn region wikiBoldAndItalic start=+'''''+ end=+'''''+ contains=@Spell,wikiLink
|
||||||
|
|
||||||
|
syn region wikiBoldItalic contained start=+'\@<!'''\@!+ end=+''+ contains=@Spell,wikiLink
|
||||||
|
syn region wikiItalicBold contained start=+'''+ end=+'''+ contains=@Spell,wikiLink
|
||||||
|
|
||||||
|
syn region wikiH1 start="^=" end="=" skip="<nowiki>.*</nowiki>" oneline contains=@Spell,wikiLink
|
||||||
|
syn region wikiH2 start="^==" end="==" skip="<nowiki>.*</nowiki>" oneline contains=@Spell,wikiLink
|
||||||
|
syn region wikiH3 start="^===" end="===" skip="<nowiki>.*</nowiki>" oneline contains=@Spell,wikiLink
|
||||||
|
syn region wikiH4 start="^====" end="====" skip="<nowiki>.*</nowiki>" oneline contains=@Spell,wikiLink
|
||||||
|
syn region wikiH5 start="^=====" end="=====" skip="<nowiki>.*</nowiki>" oneline contains=@Spell,wikiLink
|
||||||
|
syn region wikiH6 start="^======" end="======" skip="<nowiki>.*</nowiki>" oneline contains=@Spell,wikiLink
|
||||||
|
syn region wikiLink start="\[\[" end="\]\]\(s\|'s\|es\|ing\|\)" skip="<nowiki>.*</nowiki>" oneline contains=wikiLink
|
||||||
|
syn region wikiLink start="\[http:" end="\]" skip="<nowiki>.*</nowiki>" oneline
|
||||||
|
syn region wikiLink start="\[https:" end="\]" skip="<nowiki>.*</nowiki>" oneline
|
||||||
|
syn region wikiLink start="\[ftp:" end="\]" skip="<nowiki>.*</nowiki>" oneline
|
||||||
|
syn region wikiLink start="\[gopher:" end="\]" skip="<nowiki>.*</nowiki>" oneline
|
||||||
|
syn region wikiLink start="\[news:" end="\]" skip="<nowiki>.*</nowiki>" oneline
|
||||||
|
syn region wikiLink start="\[mailto:" end="\]" skip="<nowiki>.*</nowiki>" oneline
|
||||||
|
syn region wikiTemplate start="{{" end="}}" skip="<nowiki>.*</nowiki>"
|
||||||
|
|
||||||
|
syn match wikiParaFormatChar /^[\:|\*|;|#]\+/
|
||||||
|
syn match wikiParaFormatChar /^-----*/
|
||||||
|
syn match wikiPre /^\ .*$/
|
||||||
|
|
||||||
|
syn include @TeX syntax/tex.vim
|
||||||
|
syntax region wikiTeX matchgroup=htmlTag start="<math>" end="</math>" skip="<nowiki>.*</nowiki>" contains=@texMathZoneGroup
|
||||||
|
syntax region wikiRef matchgroup=htmlTag start="<ref>" end="</ref>" skip="<nowiki>.*</nowiki>"
|
||||||
|
|
||||||
|
|
||||||
|
" HTML highlighting
|
||||||
|
|
||||||
|
HtmlHiLink htmlTag Function
|
||||||
|
HtmlHiLink htmlEndTag Identifier
|
||||||
|
HtmlHiLink htmlArg Type
|
||||||
|
HtmlHiLink htmlTagName htmlStatement
|
||||||
|
HtmlHiLink htmlSpecialTagName Exception
|
||||||
|
HtmlHiLink htmlValue String
|
||||||
|
HtmlHiLink htmlSpecialChar Special
|
||||||
|
|
||||||
|
HtmlHiLink htmlH1 Title
|
||||||
|
HtmlHiLink htmlH2 htmlH1
|
||||||
|
HtmlHiLink htmlH3 htmlH2
|
||||||
|
HtmlHiLink htmlH4 htmlH3
|
||||||
|
HtmlHiLink htmlH5 htmlH4
|
||||||
|
HtmlHiLink htmlH6 htmlH5
|
||||||
|
HtmlHiLink htmlHead PreProc
|
||||||
|
HtmlHiLink htmlTitle Title
|
||||||
|
HtmlHiLink htmlBoldItalicUnderline htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlUnderlineBold htmlBoldUnderline
|
||||||
|
HtmlHiLink htmlUnderlineItalicBold htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlUnderlineBoldItalic htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlItalicUnderline htmlUnderlineItalic
|
||||||
|
HtmlHiLink htmlItalicBold htmlBoldItalic
|
||||||
|
HtmlHiLink htmlItalicBoldUnderline htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlItalicUnderlineBold htmlBoldUnderlineItalic
|
||||||
|
|
||||||
|
HtmlHiLink htmlSpecial Special
|
||||||
|
HtmlHiLink htmlSpecialChar Special
|
||||||
|
HtmlHiLink htmlString String
|
||||||
|
HtmlHiLink htmlStatement Statement
|
||||||
|
HtmlHiLink htmlComment Comment
|
||||||
|
HtmlHiLink htmlCommentPart Comment
|
||||||
|
HtmlHiLink htmlValue String
|
||||||
|
HtmlHiLink htmlCommentError htmlError
|
||||||
|
HtmlHiLink htmlTagError htmlError
|
||||||
|
HtmlHiLink htmlEvent javaScript
|
||||||
|
HtmlHiLink htmlError Error
|
||||||
|
|
||||||
|
HtmlHiLink htmlCssStyleComment Comment
|
||||||
|
HtmlHiLink htmlCssDefinition Special
|
||||||
|
|
||||||
|
" The default highlighting.
|
||||||
|
if version >= 508 || !exists("did_html_syn_inits")
|
||||||
|
if version < 508
|
||||||
|
let did_html_syn_inits = 1
|
||||||
|
endif
|
||||||
|
HtmlHiLink htmlTag Function
|
||||||
|
HtmlHiLink htmlEndTag Identifier
|
||||||
|
HtmlHiLink htmlArg Type
|
||||||
|
HtmlHiLink htmlTagName htmlStatement
|
||||||
|
HtmlHiLink htmlSpecialTagName Exception
|
||||||
|
HtmlHiLink htmlValue String
|
||||||
|
HtmlHiLink htmlSpecialChar Special
|
||||||
|
|
||||||
|
if !exists("html_no_rendering")
|
||||||
|
HtmlHiLink htmlH1 Title
|
||||||
|
HtmlHiLink htmlH2 htmlH1
|
||||||
|
HtmlHiLink htmlH3 htmlH2
|
||||||
|
HtmlHiLink htmlH4 htmlH3
|
||||||
|
HtmlHiLink htmlH5 htmlH4
|
||||||
|
HtmlHiLink htmlH6 htmlH5
|
||||||
|
HtmlHiLink htmlHead PreProc
|
||||||
|
HtmlHiLink htmlTitle Title
|
||||||
|
HtmlHiLink htmlBoldItalicUnderline htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlUnderlineBold htmlBoldUnderline
|
||||||
|
HtmlHiLink htmlUnderlineItalicBold htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlUnderlineBoldItalic htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlItalicUnderline htmlUnderlineItalic
|
||||||
|
HtmlHiLink htmlItalicBold htmlBoldItalic
|
||||||
|
HtmlHiLink htmlItalicBoldUnderline htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlItalicUnderlineBold htmlBoldUnderlineItalic
|
||||||
|
HtmlHiLink htmlLink Underlined
|
||||||
|
if !exists("html_my_rendering")
|
||||||
|
hi def htmlBold term=bold cterm=bold gui=bold
|
||||||
|
hi def htmlBoldUnderline term=bold,underline cterm=bold,underline gui=bold,underline
|
||||||
|
hi def htmlBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
|
||||||
|
hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
|
||||||
|
hi def htmlUnderline term=underline cterm=underline gui=underline
|
||||||
|
hi def htmlUnderlineItalic term=italic,underline cterm=italic,underline gui=italic,underline
|
||||||
|
hi def htmlItalic term=italic cterm=italic gui=italic
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
HtmlHiLink htmlPreStmt PreProc
|
||||||
|
HtmlHiLink htmlPreError Error
|
||||||
|
HtmlHiLink htmlPreProc PreProc
|
||||||
|
HtmlHiLink htmlPreAttr String
|
||||||
|
HtmlHiLink htmlPreProcAttrName PreProc
|
||||||
|
HtmlHiLink htmlPreProcAttrError Error
|
||||||
|
HtmlHiLink htmlSpecial Special
|
||||||
|
HtmlHiLink htmlSpecialChar Special
|
||||||
|
HtmlHiLink htmlString String
|
||||||
|
HtmlHiLink htmlStatement Statement
|
||||||
|
HtmlHiLink htmlComment Comment
|
||||||
|
HtmlHiLink htmlCommentPart Comment
|
||||||
|
HtmlHiLink htmlValue String
|
||||||
|
HtmlHiLink htmlCommentError htmlError
|
||||||
|
HtmlHiLink htmlTagError htmlError
|
||||||
|
HtmlHiLink htmlEvent javaScript
|
||||||
|
HtmlHiLink htmlError Error
|
||||||
|
|
||||||
|
HtmlHiLink javaScript Special
|
||||||
|
HtmlHiLink javaScriptExpression javaScript
|
||||||
|
HtmlHiLink htmlCssStyleComment Comment
|
||||||
|
HtmlHiLink htmlCssDefinition Special
|
||||||
|
endif
|
||||||
|
|
||||||
|
" wiki highlighting
|
||||||
|
|
||||||
|
HtmlHiLink wikiItalic htmlItalic
|
||||||
|
HtmlHiLink wikiBold htmlBold
|
||||||
|
|
||||||
|
HtmlHiLink wikiBoldItalic htmlBoldItalic
|
||||||
|
HtmlHiLink wikiItalicBold htmlBoldItalic
|
||||||
|
|
||||||
|
HtmlHiLink wikiBoldAndItalic htmlBoldItalic
|
||||||
|
|
||||||
|
HtmlHiLink wikiH1 htmlH1
|
||||||
|
HtmlHiLink wikiH2 htmlH2
|
||||||
|
HtmlHiLink wikiH3 htmlH3
|
||||||
|
HtmlHiLink wikiH4 htmlH4
|
||||||
|
HtmlHiLink wikiH5 htmlH5
|
||||||
|
HtmlHiLink wikiH6 htmlH6
|
||||||
|
HtmlHiLink wikiLink Underlined
|
||||||
|
HtmlHiLink wikiTemplate Special
|
||||||
|
HtmlHiLink wikiParaFormatChar Special
|
||||||
|
HtmlHiLink wikiPre Constant
|
||||||
|
HtmlHiLink wikiRef Comment
|
||||||
|
|
||||||
|
|
||||||
|
let b:current_syntax = "html"
|
||||||
|
|
||||||
|
delcommand HtmlHiLink
|
||||||
|
|
||||||
|
if main_syntax == 'html'
|
||||||
|
unlet main_syntax
|
||||||
|
endif
|
||||||
1
.vim/vim-pathogen
Submodule
1
.vim/vim-pathogen
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f195ac5e402a1e7d0f75322558da36245dde59d6
|
||||||
86
.vimrc
86
.vimrc
|
|
@ -1,17 +1,6 @@
|
||||||
|
set nocompatible " do not try to be vi-compatible
|
||||||
|
|
||||||
call pathogen#infect()
|
call pathogen#infect()
|
||||||
" Interesting plugins:
|
|
||||||
" pathogen - easy plugin installation
|
|
||||||
" surround - easily delete, change and add surrounding pairs of characters
|
|
||||||
" Gundo - visualizing the undo tree
|
|
||||||
" RainbowParenthesis - highlights matching parenthesis with a rainbow of colors
|
|
||||||
" tComment - smart comments toggle
|
|
||||||
" omnicppcomplete - C/C++ completion with ctags (what about clangcomplete?)
|
|
||||||
" ack - run ack-grep from vim, and shows the results in a split window
|
|
||||||
" bclose - The :Bclose command deletes a buffer without changing the window layout
|
|
||||||
" minibufexpl - list your open buffers as tabs along the top or bottom of your screen
|
|
||||||
" tasklist - search the file for FIXME, TODO, … and put them in a handy list
|
|
||||||
" yankring - maintains a list of numbered registers containing the last deletes, see :YRShow
|
|
||||||
" taglist - groups and displays the functions, classes, … in a Vim window
|
|
||||||
|
|
||||||
set guifont=Inconsolata\ 11
|
set guifont=Inconsolata\ 11
|
||||||
|
|
||||||
|
|
@ -29,8 +18,6 @@ set textwidth=120
|
||||||
set wrap " auto wrap line view, but not text itself
|
set wrap " auto wrap line view, but not text itself
|
||||||
|
|
||||||
filetype indent on " activates indenting for files
|
filetype indent on " activates indenting for files
|
||||||
set autoindent " automatic indentation
|
|
||||||
set smartindent
|
|
||||||
set softtabstop=4 " width of a tab
|
set softtabstop=4 " width of a tab
|
||||||
set tabstop=4
|
set tabstop=4
|
||||||
set shiftwidth=4 " width of the indentation
|
set shiftwidth=4 " width of the indentation
|
||||||
|
|
@ -46,7 +33,6 @@ set wildmenu " command-line completion shows a list of matches
|
||||||
set wildmode=longest,list:longest,full " Bash-vim completion behavior
|
set wildmode=longest,list:longest,full " Bash-vim completion behavior
|
||||||
set autochdir " use current working directory of a file as base path
|
set autochdir " use current working directory of a file as base path
|
||||||
|
|
||||||
set nocompatible " do not try to be vi-compatible
|
|
||||||
set encoding=utf-8
|
set encoding=utf-8
|
||||||
|
|
||||||
set nu " show line numbers
|
set nu " show line numbers
|
||||||
|
|
@ -63,7 +49,7 @@ set colorcolumn=72,120 " highligth the 80th and 120th column
|
||||||
" No need to prefix them with "* or "+
|
" No need to prefix them with "* or "+
|
||||||
set clipboard=unnamed
|
set clipboard=unnamed
|
||||||
|
|
||||||
" New split plaed below
|
" New split placed below
|
||||||
set splitbelow
|
set splitbelow
|
||||||
" New vsplit placed right
|
" New vsplit placed right
|
||||||
set splitright
|
set splitright
|
||||||
|
|
@ -78,6 +64,12 @@ set undodir=~/.vim/undodir
|
||||||
" always keep lines around the cursor
|
" always keep lines around the cursor
|
||||||
set scrolloff=5
|
set scrolloff=5
|
||||||
|
|
||||||
|
" Let cursor move past the last char in visual block mode
|
||||||
|
set virtualedit=block
|
||||||
|
|
||||||
|
" show more matching characters
|
||||||
|
set matchpairs+=<:>
|
||||||
|
|
||||||
let mapleader = "," " leader key is comma
|
let mapleader = "," " leader key is comma
|
||||||
|
|
||||||
" xx will delete the line without copying it into the default register
|
" xx will delete the line without copying it into the default register
|
||||||
|
|
@ -92,6 +84,11 @@ nnoremap G Gzz
|
||||||
" ,v will reselect the text that was just pasted
|
" ,v will reselect the text that was just pasted
|
||||||
nnoremap <leader>v V`]
|
nnoremap <leader>v V`]
|
||||||
|
|
||||||
|
" ,w will disable autowrap line break
|
||||||
|
nnoremap <leader>w :set tw=0
|
||||||
|
nnoremap <leader>W :set tw=80
|
||||||
|
nnoremap <leader>x :set tw=120
|
||||||
|
|
||||||
" ,s will split vertically and swith over the new panel
|
" ,s will split vertically and swith over the new panel
|
||||||
nnoremap <leader>s <C-w>v<C-w>l:bn<CR>
|
nnoremap <leader>s <C-w>v<C-w>l:bn<CR>
|
||||||
|
|
||||||
|
|
@ -142,12 +139,12 @@ au VimEnter * echomsg system('/usr/games/fortune vimtweets')
|
||||||
|
|
||||||
|
|
||||||
set laststatus=2 " always show the statusline, even when there is only one file edited
|
set laststatus=2 " always show the statusline, even when there is only one file edited
|
||||||
if has("statusline")
|
" if has("statusline")
|
||||||
"set statusline=\ %f%m%r\ [%{strlen(&ft)?&ft:'aucun'},%{strlen(&fenc)?&fenc:&enc},%{&fileformat},ts:%{&tabstop}]%{fugitive#statusline()}%=%l,%c%V\ %P
|
" "set statusline=\ %f%m%r\ [%{strlen(&ft)?&ft:'aucun'},%{strlen(&fenc)?&fenc:&enc},%{&fileformat},ts:%{&tabstop}]%{fugitive#statusline()}%=%l,%c%V\ %P
|
||||||
set statusline=\ %f%m%r\ [%{strlen(&ft)?&ft:'aucun'},%{strlen(&fenc)?&fenc:&enc},%{&fileformat},ts:%{&tabstop}]%=%l,%c%V\ %P
|
" set statusline=\ %f%m%r\ [%{strlen(&ft)?&ft:'aucun'},%{strlen(&fenc)?&fenc:&enc},%{&fileformat},ts:%{&tabstop}]%=%l,%c%V\ %P
|
||||||
elseif has("cmdline_info")
|
" elseif has("cmdline_info")
|
||||||
set ruler " show current line and column number
|
" set ruler " show current line and column number
|
||||||
endif
|
" endif
|
||||||
|
|
||||||
|
|
||||||
if has("fname_case")
|
if has("fname_case")
|
||||||
|
|
@ -172,25 +169,25 @@ au BufRead,BufNewFile *.mwiki setf Wikipedia
|
||||||
au BufRead,BufNewFile *.wikipedia.org.* setf Wikipedia
|
au BufRead,BufNewFile *.wikipedia.org.* setf Wikipedia
|
||||||
|
|
||||||
" autocomplétion with <TAB> instead of <C-n>, depending on the context
|
" autocomplétion with <TAB> instead of <C-n>, depending on the context
|
||||||
function! Smart_TabComplete()
|
" function! Smart_TabComplete()
|
||||||
let line = getline('.') " curline
|
" let line = getline('.') " curline
|
||||||
let substr = strpart(line, -1, col('.')+1) " from start to cursor
|
" let substr = strpart(line, -1, col('.')+1) " from start to cursor
|
||||||
let substr = matchstr(substr, "[^ \t]*$") " word till cursor
|
" let substr = matchstr(substr, "[^ \t]*$") " word till cursor
|
||||||
if (strlen(substr)==0) " nothing to match on empty string
|
" if (strlen(substr)==0) " nothing to match on empty string
|
||||||
return "\<tab>"
|
" return "\<tab>"
|
||||||
endif
|
" endif
|
||||||
let has_period = match(substr, '\.') != -1 " position of period, if any
|
" let has_period = match(substr, '\.') != -1 " position of period, if any
|
||||||
let has_slash = match(substr, '\/') != -1 " position of slash, if any
|
" let has_slash = match(substr, '\/') != -1 " position of slash, if any
|
||||||
if (!has_period && !has_slash)
|
" if (!has_period && !has_slash)
|
||||||
return "\<C-X>\<C-P>" " existing text matching
|
" return "\<C-X>\<C-P>" " existing text matching
|
||||||
elseif ( has_slash )
|
" elseif ( has_slash )
|
||||||
return "\<C-X>\<C-F>" " file matching
|
" return "\<C-X>\<C-F>" " file matching
|
||||||
else
|
" else
|
||||||
return "\<C-X>\<C-O>" " plugin matching
|
" return "\<C-X>\<C-O>" " plugin matching
|
||||||
endif
|
" endif
|
||||||
endfunction
|
" endfunction
|
||||||
|
|
||||||
inoremap <tab> <c-r>=Smart_TabComplete()<CR>
|
" inoremap <tab> <c-r>=Smart_TabComplete()<CR>
|
||||||
|
|
||||||
|
|
||||||
" Append modeline after last line in buffer.
|
" Append modeline after last line in buffer.
|
||||||
|
|
@ -225,10 +222,13 @@ imap <F7> <C-o>:call MySpellLang()<CR>
|
||||||
map <F10> <Plug>TaskList
|
map <F10> <Plug>TaskList
|
||||||
|
|
||||||
" side pane of class and functions
|
" side pane of class and functions
|
||||||
map <F11> :TlistToggle<cr>
|
"map <F11> :TlistToggle<cr>
|
||||||
|
nmap <F11> :TagbarToggle<CR>
|
||||||
|
nnoremap <leader>b :TagbarToggle<CR>
|
||||||
|
|
||||||
" side pane of files
|
" side pane of files
|
||||||
map <F12> :NERDTreeToggle<cr>
|
map <F12> :NERDTreeToggle<cr>
|
||||||
|
nnoremap <leader>t :NERDTreeToggle<cr>
|
||||||
|
|
||||||
" configure tags - add additional tags here or comment out not-used ones
|
" configure tags - add additional tags here or comment out not-used ones
|
||||||
set tags+=~/.vim/tags/cpp
|
set tags+=~/.vim/tags/cpp
|
||||||
|
|
@ -257,5 +257,3 @@ set completeopt=menuone,menu,longest,preview
|
||||||
:runtime plugins/bclose.vim
|
:runtime plugins/bclose.vim
|
||||||
nmap :bc <Plug>Kwbd
|
nmap :bc <Plug>Kwbd
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue