dotfiles

configuration files for different softwares
git clone git://z3bra.org/dotfiles
Log | Files | Refs

commit c7601589d513177cc8f8ee362712e2a4f05d4b74
parent 9a5df7e6da5042d3469799283e37b20128eb13eb
Author: Willy Goiffon <w.goiffon@gmail.com>
Date:   Mon Aug  5 12:30:45 2013

Merge branch 'master' of gitorious.org:z3bra/dotfiles

Diffstat:
 .gitignore               |  2 +-
 irssi/config             |  8 +----
 mutt/muttrc              |  1 +-
 vim/colors/16.vim        | 61 +-------------------------------
 vim/colors/ambient.vim   | 58 +------------------------------
 vim/colors/sandstorm.vim |  2 +-
 vim/colors/shadow.vim    | 96 +++++++++++++++++++++++++------------------------
 vimrc                    | 20 +++++++---
 8 files changed, 66 insertions(+), 182 deletions(-)

diff --git a/.gitignore b/.gitignore @@ -11,4 +11,6 @@ mutt/.passwd.gpg ncmpcpp/error.log +elinks/* + vim/.netrwhist diff --git a/irssi/config b/irssi/config @@ -262,14 +262,6 @@ statusbar = { barend = { priority = "100"; alignment = "right"; }; }; }; - awl_1 = { - placement = "top"; - items = { - barstart = { priority = "100"; }; - awl_1 = { }; - barend = { priority = "100"; alignment = "right"; }; - }; - }; }; }; # }}} diff --git a/mutt/muttrc b/mutt/muttrc @@ -11,7 +11,6 @@ set sendmail="/usr/bin/msmtp" ## --- Fetch mails (fdm) --- set mbox_type=Maildir -set header_cache=~/.cach/mutt ## --- Folders --- set folder=$HOME/var/mail/ diff --git a/vim/colors/16.vim b/vim/colors/16.vim @@ -1,61 +0,0 @@ -" -" Terminal setup. -" -set background=dark -if version > 580 - highlight clear - if exists("g:syntax_on") - syntax reset - endif -endif -let g:colors_name="16" - - " - " Actual colours and styles. - " - highlight Comment term=NONE cterm=NONE ctermfg=8 ctermbg=NONE - highlight Constant term=NONE cterm=NONE ctermfg=11 ctermbg=NONE - highlight Cursor term=NONE cterm=NONE ctermfg=66 ctermbg=222 - highlight CursorLine term=NONE cterm=NONE ctermfg=15 ctermbg=8 - highlight DiffAdd term=NONE cterm=NONE ctermfg=NONE ctermbg=2 - highlight DiffChange term=NONE cterm=NONE ctermfg=NONE ctermbg=4 - highlight DiffDelete term=NONE cterm=NONE ctermfg=NONE ctermbg=1 - highlight DiffText term=NONE cterm=NONE ctermfg=NONE ctermbg=4 - highlight FoldColumn term=NONE cterm=NONE ctermfg=5 ctermbg=8 - highlight Folded term=NONE cterm=NONE ctermfg=7 ctermbg=8 - - highlight Function term=NONE cterm=NONE ctermfg=3 ctermbg=NONE - highlight Identifier term=NONE cterm=NONE ctermfg=11 ctermbg=NONE - highlight Ignore term=NONE cterm=NONE ctermfg=8 ctermbg=NONE - highlight IncSearch term=NONE cterm=NONE ctermfg=11 ctermbg=3 - highlight ModeMsg term=NONE cterm=NONE ctermfg=11 ctermbg=NONE - highlight MoreMsg term=NONE cterm=NONE ctermfg=8 ctermbg=NONE - highlight NonText term=NONE cterm=NONE ctermfg=8 ctermbg=NONE - highlight Normal term=NONE cterm=NONE ctermfg=7 ctermbg=NONE - highlight Pmenu term=NONE cterm=NONE ctermfg=15 ctermbg=8 - highlight PreProc term=NONE cterm=NONE ctermfg=9 ctermbg=NONE - highlight Question term=NONE cterm=NONE ctermfg=6 ctermbg=NONE - highlight Search term=NONE cterm=NONE ctermfg=0 ctermbg=11 - highlight Special term=NONE cterm=NONE ctermfg=9 ctermbg=NONE - highlight SpecialKey term=NONE cterm=NONE ctermfg=11 ctermbg=NONE - highlight Statement term=NONE cterm=NONE ctermfg=11 ctermbg=NONE - highlight StatusLine term=NONE cterm=NONE ctermfg=15 ctermbg=0 - highlight StatusLineNC term=NONE cterm=NONE ctermfg=0 ctermbg=8 - highlight String term=NONE cterm=NONE ctermfg=9 ctermbg=NONE - highlight Todo term=NONE cterm=NONE ctermfg=1 ctermbg=11 - highlight Type term=NONE cterm=NONE ctermfg=3 ctermbg=NONE - highlight Underlined term=NONE cterm=NONE ctermfg=2 ctermbg=NONE - highlight VertSplit term=NONE cterm=NONE ctermfg=0 ctermbg=8 - highlight Visual term=NONE cterm=NONE ctermfg=11 ctermbg=8 - highlight WarningMsg term=NONE cterm=NONE ctermfg=1 ctermbg=NONE - - " - " General highlighting group links. - " - highlight! link Title Normal - highlight! link LineNr NonText - highlight! link TabLine StatusLineNC - highlight! link TabLineFill StatusLineNC - highlight! link TabLineSel StatusLine - highlight! link VertSplit StatusLineNC - highlight! link VimHiGroup VimGroup diff --git a/vim/colors/ambient.vim b/vim/colors/ambient.vim @@ -1,58 +0,0 @@ -" Maintainer: Kevin Hamer <kevin@imarc.net> -" Version: 1.2 -" Last Change: Fri Aug 12 16:53:40 EDT 2011 - -" Changes: -" 1.2 lightened the blue slightly -" 1.1 lightened both orange-reds - -"" Based off the colors for Ambiance, the 2011 Ubuntu dark human theme. -"" Derived from Mustang by Henrique C. Alves (hcarvalhoalves@gmail.com) -"" Offers 256 color support. - -set background=light - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "ambient" - -" Vim >= 7.0 specific colors -if version >= 700 - " hi CursorLine cterm=underline - hi CursorLine cterm=underline - hi ColorColumn ctermfg=15 ctermbg=7 cterm=none - hi MatchParen ctermfg=15 ctermbg=8 cterm=bold - hi Pmenu ctermfg=15 ctermbg=8 - hi PmenuSel ctermfg=8 ctermbg=15 -endif -" General colors -hi Cursor ctermbg=12 -hi Normal ctermfg=8 -hi NonText ctermfg=237 -hi LineNr ctermfg=239 -hi StatusLine ctermfg=8 ctermbg=15 -hi StatusLineNC ctermfg=246 -hi VertSplit ctermfg=234 -hi Folded ctermfg=80 -hi Title ctermfg=8 -hi Visual ctermfg=15 -hi SpecialKey ctermfg=239 - -" Syntax highlight -hi Comment ctermfg=6 -hi Boolean ctermfg=5 -hi String ctermfg=13 -hi Identifier ctermfg=13 -hi Function ctermfg=8 -hi Type ctermfg=10 -hi Statement ctermfg=11 -hi Keyword ctermfg=4 -hi Constant ctermfg=5 -hi Number ctermfg=13 -hi Special ctermfg=5 -hi PreProc ctermfg=7 -hi Todo ctermfg=15 ctermbg=8 diff --git a/vim/colors/sandstorm.vim b/vim/colors/sandstorm.vim @@ -18,7 +18,7 @@ if has("gui_running") || &t_Co == 256 " " Actual colours and styles. " - highlight Comment term=NONE cterm=NONE ctermfg=0 ctermbg=NONE + highlight Comment term=NONE cterm=NONE ctermfg=8 ctermbg=NONE highlight Constant term=NONE cterm=NONE ctermfg=226 ctermbg=NONE highlight Cursor term=NONE cterm=NONE ctermfg=66 ctermbg=222 highlight CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=233 diff --git a/vim/colors/shadow.vim b/vim/colors/shadow.vim @@ -11,50 +11,52 @@ endif let colors_name = "shadow" -" Window elements -hi Cursor ctermfg=0 ctermbg=15 -hi Folded ctermfg=8 ctermbg=0 -hi LineNr ctermfg=7 -hi NonText ctermfg=7 -hi Normal ctermfg=7 -hi StatusLine ctermfg=15 ctermbg=0 cterm=none -hi Visual ctermfg=15 ctermbg=0 - -" Main groups -hi Comment ctermfg=15 -hi Constant ctermfg=11 cterm=none -hi Statement ctermfg=11 cterm=none -hi StatementU ctermfg=11 cterm=underline -hi Keyword ctermfg=8 -hi Underlined cterm=underline -hi Error ctermfg=15 ctermbg=1 - -hi! link String Constant -hi! link Character Constant -hi! link Number Constant -hi! link Boolean Constant -hi! link Float Constant - -hi! link Identifier Normal -hi! link Function Statement - -hi! link Operator Keyword -hi! link Preproc Keyword -hi! link Type Keyword - -hi! link Special Keyword -hi! link Ignore Normal -hi! link Todo Error - -hi! link Title Normal - -hi! link phpDefine StatementU - -hi! link HtmlArg Attribute -hi! link HtmlSpecialChar Statement - -hi! link xmlTagName Keyword -hi! link xmlEndTag Keyword -hi! link xmlEntity Statement -hi! link xmlCData Comment -hi! link xmlAttrib Attribute +if &t_Co > 15 + " Window elements + hi Cursor ctermfg=0 ctermbg=15 + hi Folded ctermfg=8 ctermbg=0 + hi LineNr ctermfg=7 + hi NonText ctermfg=7 + hi Normal ctermfg=7 + hi StatusLine ctermfg=15 ctermbg=0 cterm=none + hi Visual ctermfg=15 ctermbg=0 + + " Main groups + hi Comment ctermfg=15 + hi Constant ctermfg=11 cterm=none + hi Statement ctermfg=11 cterm=none + hi StatementU ctermfg=11 cterm=underline + hi Keyword ctermfg=8 + hi Underlined cterm=underline + hi Error ctermfg=15 ctermbg=1 + + hi! link String Constant + hi! link Character Constant + hi! link Number Constant + hi! link Boolean Constant + hi! link Float Constant + + hi! link Identifier Normal + hi! link Function Statement + + hi! link Operator Keyword + hi! link Preproc Keyword + hi! link Type Keyword + + hi! link Special Keyword + hi! link Ignore Normal + hi! link Todo Error + + hi! link Title Normal + + hi! link phpDefine StatementU + + hi! link HtmlArg Attribute + hi! link HtmlSpecialChar Statement + + hi! link xmlTagName Keyword + hi! link xmlEndTag Keyword + hi! link xmlEntity Statement + hi! link xmlCData Comment + hi! link xmlAttrib Attribute +endif diff --git a/vimrc b/vimrc @@ -2,6 +2,8 @@ " " Maintainer : Willy 'z3bra' Goiffon " +" vim: fdm=marker:tw=72:cc=73:noai:et +" " Section : " > General " > Interface @@ -15,8 +17,6 @@ " > Functions " > Misc " -" vim: set fdm=marker tw=72 noai et: -" " ====================================================================== " > General =========================================================== @@ -109,10 +109,14 @@ set tm=500 syntax on " Use 256 colors -set t_Co=16 +set t_Co=256 " Theme & colors -colorscheme 16 +if &t_Co == 256 + colorscheme sandstorm +else + colorscheme shadow +endif " Improve color for dark bkgd (set by the theme) " set background=light @@ -186,6 +190,9 @@ map <leader>w :call ToggleTW(80)<CR> " > Moving within file, buffers, windows & co. ======================== " {{{ +" matchit actually comes with vim... +silent! runtime macros/matchit.vim + " Treat broken lines as multiple lines with j/k map j gj map k gk @@ -265,6 +272,9 @@ nnoremap ZW :w<CR> " toggle between gcc and make nmap <Leader>cc :call ToggleCCompiler()<CR> + +" upload to sprunge.us +command Sprunge w !curl -F 'sprunge=<-' http://sprunge.us " }}} " > Filetypes commands ================================================ @@ -355,5 +365,3 @@ endfu " Echo a vim tips on Vim startup autocmd VimEnter * call ViewTips() - -" vim: tw=72:ts=4