dotfiles

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

commit 935487b61f235b3d87f949690620c38071cdbffa
parent a935502934b18e7d4d488a6f19048dc5d23097d6
Author: z3bra <willy@mailoo.org>
Date:   Wed Aug 27 09:36:49 2014

Merge branch 'master' of git.z3bra.org:dotfiles

Conflicts:
	vim/colors/shblah.vim

Diffstat:
 Xresources               |  2 +-
 bashrc                   |  2 +-
 mutt/colors              |  2 +-
 mutt/muttrc              |  1 +-
 vim/colors/sandstorm.vim | 69 +-------------------------------------------------
 vim/colors/shblah.vim    |  3 +-
 vimrc                    |  1 +-
 7 files changed, 7 insertions(+), 73 deletions(-)

diff --git a/Xresources b/Xresources @@ -19,7 +19,7 @@ URxvt*geometry: 80x20 !URxvt*font: -*-gohufont-medium-*-*--11-*-*-*-*-*-iso10646-1,-*-stlarch-medium-r-*-*-10-*-*-*-*-*-*-* !URxvt*boldFont: -*-gohufont-medium-*-*--11-*-*-*-*-*-iso10646-1,-*-stlarch-medium-r-*-*-10-*-*-*-*-*-*-* URxvt*font: -*-gohufont-medium-*-*--11-*-*-*-*-*-*-1,-*-stlarch-medium-r-*-*-10-*-*-*-*-*-*-* -URxvt*boldFont: -*-gohufont-medium-*-*--13-*-*-*-*-*-*-1,-*-stlarch-medium-r-*-*-10-*-*-*-*-*-*-* +URxvt*boldFont: -*-gohufont-medium-*-*--11-*-*-*-*-*-*-1,-*-stlarch-medium-r-*-*-10-*-*-*-*-*-*-* URxvt*scrollBar: false URxvt*cursorBlink: false URxvt*internalBorder: 20 diff --git a/bashrc b/bashrc @@ -144,7 +144,7 @@ alias sv="EDITOR=vim sudo -e" # Make some output colorfull alias ls="ls --color=auto" -alias grep="grep --color=auto" +#alias grep="grep --color=auto" # some more ls aliases alias ll="ls -alhF --color=auto" diff --git a/mutt/colors b/mutt/colors @@ -10,7 +10,7 @@ color status brightyellow default color tree black default color normal brightblack default color markers red default -color search black default +color search black brightblue color tilde brightmagenta default color sidebar_new brightyellow default diff --git a/mutt/muttrc b/mutt/muttrc @@ -56,6 +56,7 @@ mailboxes +INBOX \ +blog \ +isfen \ +stuffs \ + +accounts \ +paperwork \ +purchase \ +--[done]---------------------------\ diff --git a/vim/colors/sandstorm.vim b/vim/colors/sandstorm.vim @@ -1,69 +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="sandstorm" - -" -" Highlighting definitions. -" -if has("gui_running") || &t_Co == 256 - - " - " Actual colours and styles. - " - highlight ColorColumn term=NONE cterm=NONE ctermfg=8 ctermbg=228 - 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 - highlight DiffAdd term=NONE cterm=NONE ctermfg=NONE ctermbg=22 - highlight DiffChange term=NONE cterm=NONE ctermfg=NONE ctermbg=17 - highlight DiffDelete term=NONE cterm=NONE ctermfg=NONE ctermbg=52 - highlight DiffText term=NONE cterm=NONE ctermfg=NONE ctermbg=19 - highlight FoldColumn term=NONE cterm=NONE ctermfg=180 ctermbg=237 - highlight Folded term=NONE cterm=NONE ctermfg=8 ctermbg=0 - - highlight Function term=NONE cterm=NONE ctermfg=136 ctermbg=NONE - highlight Identifier term=NONE cterm=NONE ctermfg=220 ctermbg=NONE - highlight Ignore term=NONE cterm=NONE ctermfg=240 ctermbg=NONE - highlight IncSearch term=NONE cterm=NONE ctermfg=11 ctermbg=3 - highlight ModeMsg term=NONE cterm=NONE ctermfg=178 ctermbg=NONE - highlight MoreMsg term=NONE cterm=NONE ctermfg=240 ctermbg=NONE - highlight NonText term=NONE cterm=NONE ctermfg=237 ctermbg=NONE - highlight Normal term=NONE cterm=NONE ctermfg=7 ctermbg=NONE - highlight Pmenu term=NONE cterm=NONE ctermfg=231 ctermbg=237 - highlight PreProc term=NONE cterm=NONE ctermfg=178 ctermbg=NONE - highlight Question term=NONE cterm=NONE ctermfg=186 ctermbg=NONE - highlight Search term=NONE cterm=NONE ctermfg=0 ctermbg=11 - highlight Special term=NONE cterm=NONE ctermfg=222 ctermbg=NONE - highlight SpecialKey term=NONE cterm=NONE ctermfg=184 ctermbg=NONE - highlight Statement term=NONE cterm=NONE ctermfg=11 ctermbg=NONE - highlight StatusLine term=NONE cterm=NONE ctermfg=7 ctermbg=NONE - highlight StatusLineNC term=NONE cterm=NONE ctermfg=0 ctermbg=237 - highlight String term=NONE cterm=NONE ctermfg=166 ctermbg=NONE - highlight Todo term=NONE cterm=NONE ctermfg=196 ctermbg=226 - highlight Type term=NONE cterm=NONE ctermfg=3 ctermbg=NONE - highlight Underlined term=NONE cterm=NONE ctermfg=186 ctermbg=NONE - highlight VertSplit term=NONE cterm=NONE ctermfg=237 ctermbg=237 - highlight Visual term=NONE cterm=NONE ctermfg=11 ctermbg=237 - highlight WarningMsg term=NONE cterm=NONE ctermfg=209 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 VimHiGroup VimGroup - -endif - diff --git a/vim/colors/shblah.vim b/vim/colors/shblah.vim @@ -26,6 +26,7 @@ highlight DiffChange term=NONE cterm=bold ctermfg=NONE ctermbg=NONE highlight DiffDelete term=NONE cterm=bold ctermfg=7 ctermbg=1 highlight DiffText term=NONE cterm=bold ctermfg=7 ctermbg=4 highlight Directory term=NONE cterm=bold ctermfg=4 ctermbg=0 +highlight Error term=NONE cterm=NONE ctermfg=0 ctermbg=1 highlight ErrorMsg term=NONE cterm=bold ctermfg=1 ctermbg=0 highlight FoldColumn term=NONE cterm=bold ctermfg=0 ctermbg=NONE highlight Folded term=NONE cterm=bold ctermfg=0 ctermbg=NONE @@ -48,7 +49,7 @@ highlight Todo term=NONE cterm=bold ctermfg=7 ctermbg=1 highlight Type term=NONE cterm=NONE ctermfg=3 ctermbg=NONE highlight Underlined term=underline cterm=underline ctermfg=NONE ctermbg=NONE highlight VertSplit term=NONE cterm=bold ctermfg=0 ctermbg=NONE -highlight Visual term=NONE cterm=bold ctermfg=0 ctermbg=7 +highlight Visual term=NONE cterm=NONE ctermfg=0 ctermbg=7 highlight WarningMsg term=NONE cterm=bold ctermfg=3 ctermbg=NONE " General highlighting group links. diff --git a/vimrc b/vimrc @@ -36,6 +36,7 @@ colorscheme shblah " Theme & colors set encoding=utf-8 " Use UTF-8 for file/term encoding set wildmenu " Use the wildmenu +set modeline " Use modeline, also "call matchadd('ColorColumn', '\%81v', 100) " show column 80 ONLY when necessary