summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohannst <stoelp@eit.uni-kl.de>2016-10-17 20:08:55 +0200
committerjohannst <stoelp@eit.uni-kl.de>2016-10-17 20:08:55 +0200
commitecfd498c379683d344468e8160a18adcc611b341 (patch)
tree5836ab577b2c26479caaec5370f51063077b2e01
parentd496c3261a2bbfa7e396d3cd6b754f8321dec1ad (diff)
downloaddotfiles-ecfd498c379683d344468e8160a18adcc611b341.tar.gz
dotfiles-ecfd498c379683d344468e8160a18adcc611b341.zip
added colors for BufTabLine vim plugin; changed LS_COLORS and TERM; changed default term in tmux
-rwxr-xr-x.vim/colors/buddy.vim12
-rw-r--r--.vimrc7
-rw-r--r--bashrc6
-rw-r--r--tmux.conf2
4 files changed, 15 insertions, 12 deletions
diff --git a/.vim/colors/buddy.vim b/.vim/colors/buddy.vim
index 925fae8..b402d07 100755
--- a/.vim/colors/buddy.vim
+++ b/.vim/colors/buddy.vim
@@ -24,9 +24,13 @@ hi Normal guifg=#d9d9d9 guibg=#202020 guisp=#202020 gui=NONE ctermfg=253 ctermbg
"hi CTagsGlobalVariable -- no settings --
"hi SpellRare -- no settings --
"hi EnumerationValue -- no settings --
-"hi TabLineSel -- no settings --
"hi Union -- no settings --
-"hi TabLineFill -- no settings --
+hi TabLine ctermbg=235 ctermfg=244 cterm=none
+hi TabLineSel ctermbg=208 ctermfg=255 cterm=bold
+hi TabLineFill ctermbg=235 ctermfg=0 cterm=NONE
+"TODO if tabline activated
+hi BufTabLineActive ctermbg=69
+
"hi Question -- no settings --
"hi WarningMsg -- no settings --
"hi VisualNOS -- no settings --
@@ -44,7 +48,6 @@ hi Normal guifg=#d9d9d9 guibg=#202020 guisp=#202020 gui=NONE ctermfg=253 ctermbg
"hi CTagsClass -- no settings --
"hi Directory -- no settings --
"hi Underlined -- no settings --
-"hi TabLine -- no settings --
"hi clear -- no settings --
hi SpecialComment guifg=#f3cf64 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE
hi Typedef guifg=#fff200 guibg=NONE guisp=NONE gui=NONE ctermfg=11 ctermbg=NONE cterm=NONE
@@ -74,7 +77,7 @@ hi StorageClass guifg=#f0911d guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg
hi Todo guifg=#a9a9a9 guibg=NONE guisp=NONE gui=italic ctermfg=248 ctermbg=NONE cterm=NONE
hi Special guifg=#f3cf64 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE
hi LineNr guifg=#4d4d4d guibg=#1d1d1d guisp=#1d1d1d gui=NONE ctermfg=239 ctermbg=234 cterm=NONE
-"hi StatusLine guifg=#fffcf0 guibg=#444444 guisp=#444444 gui=italic ctermfg=230 ctermbg=238 cterm=NONE
+hi StatusLine ctermbg=38 ctermfg=0 cterm=NONE term=NONE gui=NONE
hi Label guifg=#f3cf64 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE
hi PMenuSel guifg=#1a1a1a guibg=#e6cd83 guisp=#e6cd83 gui=NONE ctermfg=234 ctermbg=180 cterm=NONE
hi Delimiter guifg=#f0ffe2 guibg=NONE guisp=NONE gui=NONE ctermfg=194 ctermbg=NONE cterm=NONE
@@ -95,7 +98,6 @@ hi Exception guifg=#fff200 guibg=NONE guisp=NONE gui=NONE ctermfg=11 ctermbg=NON
hi Keyword guifg=#fff200 guibg=NONE guisp=NONE gui=NONE ctermfg=11 ctermbg=NONE cterm=NONE
hi Type guifg=#ffb700 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE
hi Cursor guifg=NONE guibg=#656565 guisp=#656565 gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE
-hi PMenu guifg=#fffcf0 guibg=#444444 guisp=#444444 gui=NONE ctermfg=230 ctermbg=238 cterm=NONE
hi SpecialKey guifg=#9a9a9a guibg=#343434 guisp=#343434 gui=NONE ctermfg=247 ctermbg=236 cterm=NONE
hi Constant guifg=#e66450 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE
hi Tag guifg=#f0ffe2 guibg=NONE guisp=NONE gui=NONE ctermfg=194 ctermbg=NONE cterm=NONE
diff --git a/.vimrc b/.vimrc
index 441e93a..4ef1ef0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -41,6 +41,9 @@ set nocompatible " make vim less vi
let g:ctrlp_buftag_ctags_bin='~/.vim/bin/ctags'
let g:ctrlp_extensions = ['buffertag', 'line', 'changes', 'mixed']
+ " buftabline
+ let g:buftabline_indicators = 1
+
" omni complete
" add tags
" set tags+=~/.vim/tags/cpp_tags
@@ -249,10 +252,6 @@ autocmd QuickFixCmdPost l* nested lwindow
"autocmd! ColorScheme * hi CursorLineNR cterm=bold ctermfg=226
augroup END
- " Highlight status line
- hi StatusLine ctermbg=38 ctermfg=0 cterm=NONE term=NONE gui=NONE
- "hi StatusLineNC ctermbg=81 ctermfg=0
-
" matching brackets
"hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow
hi MatchParen cterm=underline ctermbg=89 ctermfg=208
diff --git a/bashrc b/bashrc
index 242b6e3..7ae9276 100644
--- a/bashrc
+++ b/bashrc
@@ -3,7 +3,9 @@
#{{{ general bash settings
-export TERM=xterm-256color
+if [ "$TERM" == "screen" ]; then export TERM=screen-256color; fi
+if [ "$TERM" == "xterm" ]; then export TERM=xterm-256color; fi
+
# disable sticky mode
stty -ixon
@@ -37,6 +39,6 @@ export PS1="${BCol_DarkRed}::${BCol_DarkOrange}\u${BCol_DarkRed}::${BCol_LightOr
#}}}
#{{{ ls colors
-export LS_COLORS='di=34:ln=96:or=96;41:so=0:pi=0:ex=01;92:bd=0;42:cd=0;42:su=0:sg=0:tw=30;44:ow=30;44'
+export LS_COLORS='di=94:ln=96:or=96;41:so=0:pi=0:ex=01;92:bd=0;42:cd=0;42:su=0:sg=0:tw=30;44:ow=30;44'
#}}}
diff --git a/tmux.conf b/tmux.conf
index ea480b9..f982f49 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -5,7 +5,7 @@
### Basic Settings
# default TERM
-set -g default-terminal "xterm-256color"
+set -g default-terminal "screen-256color"
# re-map prefix key
set -g prefix C-s