# HG changeset patch # User Ludovic Chabant # Date 1318912500 25200 # Node ID 9dbf340c795613015169ab800ec2a5444a51811d Initial commit diff -r 000000000000 -r 9dbf340c7956 vim/autoload/pathogen.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/autoload/pathogen.vim Mon Oct 17 21:35:00 2011 -0700 @@ -0,0 +1,233 @@ +" pathogen.vim - path option manipulation +" Maintainer: Tim Pope +" Version: 2.0 + +" Install in ~/.vim/autoload (or ~\vimfiles\autoload). +" +" For management of individually installed plugins in ~/.vim/bundle (or +" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc +" prior to `filetype plugin indent on` is the only other setup necessary. +" +" The API is documented inline below. For maximum ease of reading, +" :set foldmethod=marker + +if exists("g:loaded_pathogen") || &cp + finish +endif +let g:loaded_pathogen = 1 + +" Point of entry for basic default usage. Give a directory name to invoke +" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path +" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards, +" pathogen#cycle_filetype() is invoked. +function! pathogen#infect(...) abort " {{{1 + let source_path = a:0 ? a:1 : 'bundle' + if source_path =~# '[\\/]' + call pathogen#runtime_prepend_subdirectories(source_path) + else + call pathogen#runtime_append_all_bundles(source_path) + endif + call pathogen#cycle_filetype() +endfunction " }}}1 + +" Split a path into a list. +function! pathogen#split(path) abort " {{{1 + if type(a:path) == type([]) | return a:path | endif + let split = split(a:path,'\\\@,'edit',,0) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) +command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) + +" vim:set ft=vim ts=8 sw=2 sts=2: diff -r 000000000000 -r 9dbf340c7956 vim/backup/.empty diff -r 000000000000 -r 9dbf340c7956 vim/colors/macvim.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/macvim.vim Mon Oct 17 21:35:00 2011 -0700 @@ -0,0 +1,133 @@ +" MacVim colorscheme +" +" Maintainer: Bjorn Winckler +" Last Change: 2008 May 9 +" +" This is the default MacVim color scheme. It supports both light and dark +" backgrounds (see :h 'background'). +" + + +highlight clear + +" Reset String -> Constant links etc if they were reset +if exists("syntax_on") + syntax reset +endif + +let colors_name = "macvim" + + +" +" First list all groups common to both 'light' and 'dark' background. +" + +" `:he highlight-groups` +hi DiffAdd guibg=MediumSeaGreen +hi Directory guifg=#1600FF +hi ErrorMsg guibg=Firebrick2 guifg=White +hi FoldColumn guibg=Grey guifg=DarkBlue +hi Folded guibg=#E6E6E6 guifg=DarkBlue +hi IncSearch gui=reverse +hi ModeMsg gui=bold +hi MoreMsg gui=bold guifg=SeaGreen4 +hi NonText gui=bold guifg=Blue +hi Pmenu guibg=LightSteelBlue1 +hi PmenuSbar guibg=Grey +hi PmenuSel guifg=White guibg=SkyBlue4 +hi PmenuThumb gui=reverse +hi Question gui=bold guifg=Chartreuse4 +hi SignColumn guibg=Grey guifg=DarkBlue +hi SpecialKey guifg=Blue +hi SpellBad guisp=Firebrick2 gui=undercurl +hi SpellCap guisp=Blue gui=undercurl +hi SpellLocal guisp=DarkCyan gui=undercurl +hi SpellRare guisp=Magenta gui=undercurl +hi StatusLine gui=NONE guifg=White guibg=DarkSlateGray +hi StatusLineNC gui=NONE guifg=SlateGray guibg=Gray90 +hi TabLine gui=underline guibg=LightGrey +hi TabLineFill gui=reverse +hi TabLineSel gui=bold +hi Title gui=bold guifg=DeepSkyBlue3 +hi VertSplit gui=NONE guifg=DarkSlateGray guibg=Gray90 +if has("gui_macvim") + hi Visual guibg=MacSelectedTextBackgroundColor +else + hi Visual guibg=#72F7FF +endif +hi WarningMsg guifg=Firebrick2 + +" Syntax items (`:he group-name` -- more groups are available, these are just +" the top level syntax items for now). +hi Error gui=NONE guifg=White guibg=Firebrick3 +hi Identifier gui=NONE guifg=Aquamarine4 guibg=NONE +hi Ignore gui=NONE guifg=bg guibg=NONE +hi PreProc gui=NONE guifg=DodgerBlue3 guibg=NONE +hi Special gui=NONE guifg=BlueViolet guibg=NONE +hi String gui=NONE guifg=SkyBlue4 guibg=NONE +hi Underlined gui=underline guifg=SteelBlue1 + + +" +" Groups that differ between 'light' and 'dark' background. +" + +if &background == "dark" + hi Boolean gui=NONE guifg=DeepPink4 guibg=NONE + hi Comment gui=italic guifg=CadetBlue3 + hi Constant gui=NONE guifg=Goldenrod1 guibg=NONE + hi Cursor guibg=LightGoldenrod guifg=bg + hi CursorColumn guibg=Gray20 + hi CursorIM guibg=LightSlateGrey guifg=bg + hi CursorLine guibg=Gray20 + hi DiffChange guibg=MediumPurple4 + hi DiffDelete gui=bold guifg=White guibg=SlateBlue + hi DiffText gui=NONE guifg=White guibg=SteelBlue + hi LineNr guifg=#552A7B guibg=Grey5 + hi MatchParen guifg=White guibg=Magenta + hi Normal guifg=Grey50 guibg=Grey10 + hi Search guibg=Blue4 guifg=NONE + hi Statement gui=bold guifg=Purple1 guibg=NONE + hi Todo gui=NONE guifg=Green4 guibg=DeepSkyBlue1 + hi Type gui=bold guifg=Cyan4 guibg=NONE + hi WildMenu guibg=SkyBlue guifg=White + hi lCursor guibg=LightSlateGrey guifg=bg +else + hi Boolean gui=NONE guifg=Red3 guibg=NONE + hi Comment gui=italic guifg=Blue2 guibg=NONE + hi Constant gui=NONE guifg=DarkOrange guibg=NONE + hi Cursor guibg=fg guifg=bg + hi CursorColumn guibg=#F1F5FA + hi CursorIM guibg=fg guifg=bg + hi CursorLine guibg=#F1F5FA + hi DiffChange guibg=DeepSkyBlue + hi DiffDelete gui=bold guifg=Black guibg=SlateBlue + hi DiffText gui=NONE guibg=Gold + hi LineNr guifg=#888888 guibg=#E6E6E6 + hi MatchParen guifg=White guibg=MediumPurple1 + if has("gui_macvim") + hi Normal gui=NONE guifg=MacTextColor guibg=MacTextBackgroundColor + else + hi Normal gui=NONE guifg=Black guibg=White + endif + hi Search guibg=CadetBlue1 guifg=NONE + hi Statement gui=bold guifg=Maroon guibg=NONE + hi Todo gui=NONE guifg=DarkGreen guibg=PaleGreen1 + hi Type gui=bold guifg=Green4 guibg=NONE + hi WildMenu guibg=SkyBlue guifg=Black + hi lCursor guibg=fg guifg=bg +endif + + +" +" Change the selection color on focus change (but only if the "macvim" +" colorscheme is active). +" +if has("gui_macvim") && !exists("s:augroups_defined") + au FocusLost * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSecondarySelectedControlColor | endif + au FocusGained * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSelectedTextBackgroundColor | endif + + let s:augroups_defined = 1 +endif + +" vim: sw=2 diff -r 000000000000 -r 9dbf340c7956 vim/colors/miro8.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/miro8.vim Mon Oct 17 21:35:00 2011 -0700 @@ -0,0 +1,115 @@ +" Author: jasonwryan +" URL: http://jasonwryan.com + +set background=dark +hi clear +if exists("syntax on") + syntax reset +endif + +let g:color_name="miro8" + +hi Normal ctermfg=white cterm=bold +hi Ignore ctermfg=black cterm=bold +hi Comment ctermfg=white +hi LineNr ctermfg=black cterm=bold +hi Float ctermfg=yellow +hi Include ctermfg=magenta +hi Define ctermfg=green +hi Macro ctermfg=magenta cterm=bold +hi PreProc ctermfg=green cterm=bold +hi PreCondit ctermfg=magenta cterm=bold +hi NonText ctermfg=cyan +hi Directory ctermfg=cyan +hi SpecialKey ctermfg=yellow cterm=bold +hi Type ctermfg=cyan +hi String ctermfg=green +hi Constant ctermfg=magenta cterm=bold +hi Special ctermfg=green cterm=bold +hi SpecialChar ctermfg=red cterm=bold +hi Number ctermfg=yellow cterm=bold +hi Identifier ctermfg=magenta cterm=bold +hi Conditional ctermfg=cyan cterm=bold +hi Repeat ctermfg=red cterm=bold +hi Statement ctermfg=blue +hi Label ctermfg=magenta cterm=bold +hi Operator ctermfg=yellow +hi Keyword ctermfg=red cterm=bold +hi StorageClass ctermfg=yellow cterm=bold +hi Structure ctermfg=magenta +hi Typedef ctermfg=cyan +hi Function ctermfg=yellow cterm=bold +hi Exception ctermfg=red +hi Underlined ctermfg=blue +hi Title ctermfg=yellow +hi Tag ctermfg=yellow cterm=bold +hi Delimiter ctermfg=blue cterm=bold +hi SpecialComment ctermfg=red cterm=bold +hi Boolean ctermfg=yellow +hi Todo ctermfg=red ctermbg=None cterm=bold +hi MoreMsg ctermfg=magenta ctermbg=None cterm=bold +hi ModeMsg ctermfg=yellow ctermbg=None cterm=bold +hi Debug ctermfg=red ctermbg=None +hi MatchParen ctermfg=black ctermbg=white +hi ErrorMsg ctermfg=red ctermbg=None +hi WildMenu ctermfg=magenta ctermbg=white cterm=bold +hi Folded cterm=reverse ctermfg=cyan ctermbg=black +hi Search ctermfg=red ctermbg=white cterm=bold +hi IncSearch ctermfg=red ctermbg=white +hi WarningMsg ctermfg=red ctermbg=white +hi Question ctermfg=green ctermbg=white cterm=bold +hi Pmenu ctermfg=green ctermbg=white cterm=bold +hi PmenuSel ctermfg=red ctermbg=white +hi Visual ctermfg=black ctermbg=None cterm=bold +hi StatusLine ctermfg=black ctermbg=white +hi StatusLineNC ctermfg=black ctermbg=black cterm=bold + +" Specific for Vim script --- +hi vimCommentTitle ctermfg=green cterm=bold +hi vimFold ctermfg=black ctermbg=white cterm=bold + +" Specific for help files --- +hi helpHyperTextJump ctermfg=yellow cterm=bold + +" JS numbers only --- +hi javaScriptNumber ctermfg=yellow cterm=bold + +" Special for HTML --- +hi htmlTag ctermfg=cyan +hi htmlEndTag ctermfg=cyan +hi htmlTagName ctermfg=yellow cterm=bold + +" Specific for Perl --- +hi perlSharpBang ctermfg=green cterm=bold term=standout +hi perlStatement ctermfg=magenta cterm=bold +hi perlStatementStorage ctermfg=red +hi perlVarPlain ctermfg=yellow +hi perlVarPlain2 ctermfg=yellow cterm=bold + +" Specific for Ruby --- +hi rubySharpBang ctermfg=green cterm=bold term=standout + +" Specific for diff --- +hi diffLine ctermfg=green cterm=bold +hi diffOldLine ctermfg=green +hi diffOldFile ctermfg=green +hi diffNewFile ctermfg=yellow +hi diffAdded ctermfg=blue +hi diffRemoved ctermfg=red +hi diffChanged ctermfg=cyan + +" Spell checking --- +if version >= 700 + hi clear SpellBad + hi clear SpellCap + hi clear SpellRare + hi clear SpellLocal + hi SpellBad cterm=underline + hi SpellCap cterm=underline + hi SpellRare cterm=underline + hi SpellLocal cterm=underline +endif + +"endif + +" vim: foldmethod=marker foldmarker={{{,}}}: diff -r 000000000000 -r 9dbf340c7956 vim/colors/tolerable.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/tolerable.vim Mon Oct 17 21:35:00 2011 -0700 @@ -0,0 +1,43 @@ +" Vim color file +" Maintainer: Ian Langworth +" Last Change: 2004 Dec 24 +" Email: + +" Color settings inspired by BBEdit for Mac OS, plus I liked +" the low-contrast comments from the 'oceandeep' colorscheme + +set background=light +hi clear +if exists("syntax_on") + syntax reset +endif +let g:colors_name="tolerable" + +hi Cursor guifg=white guibg=darkgreen + +hi Normal gui=none guifg=black guibg=white +hi NonText gui=none guifg=orange guibg=white + +hi Statement gui=none guifg=blue +hi Special gui=none guifg=red +hi Constant gui=none guifg=darkred +hi Comment gui=none guifg=#555555 +hi Preproc gui=none guifg=darkcyan +hi Type gui=none guifg=darkmagenta +hi Identifier gui=none guifg=darkgreen +hi Title gui=none guifg=black + +hi StatusLine gui=none guibg=#333333 guifg=white +hi StatusLineNC gui=none guibg=#333333 guifg=white +hi VertSplit gui=none guibg=#333333 guifg=white + +hi Visual gui=none guibg=green guifg=black +hi Search gui=none guibg=yellow +hi Directory gui=none guifg=darkblue +hi WarningMsg gui=none guifg=red +hi Error gui=none guifg=white guibg=red +hi Todo gui=none guifg=black guibg=yellow + +hi MoreMsg gui=none +hi ModeMsg gui=none + diff -r 000000000000 -r 9dbf340c7956 vim/temp/.empty diff -r 000000000000 -r 9dbf340c7956 vim/vimrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/vimrc Mon Oct 17 21:35:00 2011 -0700 @@ -0,0 +1,144 @@ +" Ludovic Chabant's ~/.vimrc +" + +" Use Vim settings, rather then Vi settings (much better!). +" This must be first, because it changes other options as a side effect. +set nocompatible + +" Load pathogen. +call pathogen#infect() + +" Hide the toolbar in MacVim +if has("gui_running") + set guioptions=-t +endif + +colorscheme macvim + +" Various options +set hidden +set number +set autoindent +set smartindent +set confirm +set history=1000 +set incsearch +set hlsearch +set ignorecase +set smartcase +set laststatus=2 +set mouse=a +set showcmd +set ruler +set nobackup +set writebackup +set backupdir=~/.vim/backup +set directory=~/.vim/temp +set wildmenu +set wildignore+=.DS_Store,Thumbs.db +set showtabline=2 +set showmatch +set ffs=unix,mac,dos +set guifont=Monaco:h12 +set tabstop=4 +set shiftwidth=4 +set softtabstop=4 +set smarttab +set expandtab +set clipboard=unnamed +set ttyfast +set backspace=indent,eol,start + +" Syntax highlighting +syntax on + +" File types +filetype indent plugin on + + +" Temporary stuff +"let mapleader="," " Use , as Leader +"let gmapleader="," +"map Y y$ " Yank to the end of the line w/ Y +"map nt :tabnew " New tab w/ ,nt +"map f :FufFile " Find files with ,f +"nmap w :w! +"map :r !pbpaste +"map :setlocal spell spelllang=en_gb " Turn on spellcheck with +"map :set nospell +"set pastetoggle= +"map :set complete+=k +"map :set complete=-k +"map :YRShow " Show the YankRing w/ +"nnoremap :GundoToggle " Show the undo tree w/ +"nnoremap ; : +"autocmd BufRead,BufNewfile ~/notes/* set filetype=markdown " All files in ~/notes are Markdown +"au BufWinLeave *.html,*.css mkview +"au BufWinEnter *.html,*.css silent loadview +"au FileType mail set tw=65 " Thin width when writing mail in mutt +"au FocusLost * :wa " Saves file when vim loses focus +"if has('statusline') " Status line with git repo info +" set statusline=%<%f\ +" set statusline+=%w%h%m%r +" set statusline+=%{fugitive#statusline()} +" set statusline+=\ [%{&ff}/%Y] +" set statusline+=\ [%{getcwd()}] +" set statusline+=%=%-14.(Line:\ %l\ of\ %L\ [%p%%]\ -\ Col:\ %c%V%) +"endif + +" When started as "evim", evim.vim will already have done these settings. +"if v:progname =~? "evim" +" finish +"endif + +" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries +" let &guioptions = substitute(&guioptions, "t", "", "g") + +" Don't use Ex mode, use Q for formatting +"map Q gq + +" This is an alternative that also works in block mode, but the deleted +" text is lost and it only works for putting the current register. +"vnoremap p "_dp + +" Switch syntax highlighting on, when the terminal has colors +" Also switch on highlighting the last used search pattern. +"if &t_Co > 2 || has("gui_running") +" syntax on +" set hlsearch +"endif + +" Only do this part when compiled with support for autocommands. +"if has("autocmd") + + " Enable file type detection. + " Use the default filetype settings, so that mail gets 'tw' set to 72, + " 'cindent' is on in C files, etc. + " Also load indent files, to automatically do language-dependent indenting. +" filetype plugin indent on + + " Put these in an autocmd group, so that we can delete them easily. +" augroup vimrcEx +" au! + + " For all text files set 'textwidth' to 78 characters. +" autocmd FileType text setlocal textwidth=78 + + " When editing a file, always jump to the last known cursor position. + " Don't do it when the position is invalid or when inside an event handler + " (happens when dropping a file on gvim). +" autocmd BufReadPost * +" \ if line("'\"") > 0 && line("'\"") <= line("$") | +" \ exe "normal g`\"" | +" \ endif + +" augroup END + +"else + +" set autoindent " always set autoindenting on + +"endif " has("autocmd") + +"set fileformats=dos,unix " set fileformat to DOS by default +