diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 9efba01..8a6ff90 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -7,13 +7,9 @@ unbind % # reload config file (change file location to your the tmux.conf you want to use) bind r source-file ~/.tmux.conf -# Panes -set -g pane-border-fg black -set -g pane-active-border-fg blue - ## Status bar design set -g status-position bottom -set -g status-bg colour24 +set -g status-bg colour239 set -g status-attr dim set -g status-right '#[fg=colour233,bg=colour102,bold] %d/%m #[fg=colour233,bg=colour102,bold] %H:%M:%S ' set -g status-right-length 50 @@ -30,7 +26,8 @@ setw -g window-status-current-format ' #I#[fg=colour0] #[fg=colour0]#W ' # Background windows setw -g window-status-fg colour0 -setw -g window-status-bg colour10 +setw -g window-status-bg colour240 + setw -g window-status-attr none setw -g window-status-format ' #I#[fg=colour0] #[fg=colour0]#W ' @@ -38,6 +35,6 @@ setw -g window-status-format ' #I#[fg=colour0] #[fg=colour0]#W ' set -g mouse on # Terminal colors -set -g default-terminal "xterm-256color" +set -g default-terminal "screen-256color" set-option -ga update-environment ' DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY' diff --git a/vim/.vimrc b/vim/.vimrc index 795bdd2..bbdd9cf 100755 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -39,9 +39,12 @@ set wildmenu set backspace=2 set background=dark +" Vim & Tmux background color fix +set t_ut= + " Terminal colors "Colorscheme -colorscheme solarized +colorscheme alduin "Automatically source vimrc on save. autocmd! bufwritepost $MYVIMRC source $MYVIMRC @@ -75,27 +78,10 @@ set pastetoggle= "Default Colors for CursorLine set cursorline -"hi CursorLine cterm=NONE ctermbg=235 "Activate statusbar set laststatus=2 -"Space in toolbar is "%=\ -"set statusline= -"set statusline+=%1*\ %n\ "Buffernr -"set statusline+=%1*\ %F\ %m%r%w "File + modified/readonly -"set statusline+=%1*\ %= "Space between filename -"set statusline+=%1*\ %{hostname()}\ "Hostname -"set statusline+=%1*\ %{strlen(&ft)?&ft:'none'}\ "Filetype -"set statusline+=%1*\ %{''.(&fenc!=''?&fenc:&enc).''} "Encoding -"set statusline+=%1*\ %{(&bomb?\",BOM\":\"\")}\ "Encoding2 -"set statusline+=%1*\ %{&ff}\ "FileFormat (dos/unix..) -"set statusline+=%1*\ %l/%L\ \ "Rownumber/total (%) -"set statusline+=%1*\ %P\ "Readonly? Top/bot - -"Statusbar colors -"hi User1 ctermbg=237 - "Copy to clipboard vnoremap y "+y vnoremap x "+x @@ -123,12 +109,12 @@ endfunction inoremap =Smart_TabComplete() " Plugins -" + " Nerdtree map :NERDTreeToggle " Airline -let g:airline_theme = 'solarized' +let g:airline_theme = 'distinguished' let g:airline_section_y = '%{hostname()}' let g:airline_section_b = '%{fugitive#statusline()}' let g:airline_powerline_fonts = 1 diff --git a/vim/colors/newproggie.vim b/vim/colors/newproggie.vim new file mode 100644 index 0000000..f836127 --- /dev/null +++ b/vim/colors/newproggie.vim @@ -0,0 +1,96 @@ +" ----------------------------------------------------------------------------- +" Vim color file +" Maintainer: Kai Wolf +" Last Change: 2016 August +" License: Beer Ware +" ----------------------------------------------------------------------------- + +" Reset Highlighting +hi clear +if exists("syntax_on") + syntax reset +endif + +" General settings +set background=dark +let g:colors_name="newproggie" + +" Editor settings +hi Normal cterm=none ctermbg=0 ctermfg=7 gui=none guibg=#1E1E1E guifg=#B0B0B0 +hi CursorLine cterm=bold ctermbg=0 ctermfg=15 gui=bold guibg=#1E1E1E guifg=#F7F7F7 +hi Cursor cterm=none ctermbg=1 ctermfg=0 gui=none guibg=#A94744 guifg=#1E1E1E +hi LineNr cterm=none ctermbg=0 ctermfg=7 gui=none guibg=#1E1E1E guifg=#B0B0B0 +hi CursorLineNR cterm=none ctermbg=1 ctermfg=0 gui=none guibg=#A94744 guifg=#1E1E1E + +" Number column +hi CursorColumn cterm=none ctermbg=1 ctermfg=0 gui=none guibg=#A94744 guifg=#1E1E1E +hi FoldColumn cterm=none ctermbg=0 ctermfg=2 gui=none guibg=#1E1E1E guifg=#608B4E +hi Folded cterm=none ctermbg=0 ctermfg=2 gui=none guibg=#1E1E1E guifg=#608B4E + +" Window / Tab delimiters +hi TabLine cterm=none ctermbg=0 ctermfg=3 gui=none guibg=#1E1E1E guifg=#D69831 +hi TabLineFill cterm=none ctermbg=0 ctermfg=3 gui=none guibg=#1E1E1E guifg=#D69831 +hi TabLineSel cterm=none ctermbg=0 ctermfg=3 gui=none guibg=#1E1E1E guifg=#D69831 +hi OverLength cterm=none ctermbg=0 ctermfg=1 gui=none guibg=#1E1E1E guifg=#A94744 + +" File navigation / Searching +hi Directory cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Search cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#218693 guifg=#F7F7F7 +hi IncSearch cterm=none ctermbg=3 ctermfg=8 gui=none guibg=#D69831 guifg=#3C3C3C + +" Prompt / Status +hi StatusLine cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#3C3C3C guifg=#F7F7F7 +hi StatusLineNC cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#3C3C3C +hi Title cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi ModeMsg cterm=bold ctermbg=0 ctermfg=10 gui=bold guibg=#1E1E1E guifg=#8FBF7F + +" Visual aid +hi MatchParen cterm=bold ctermbg=0 ctermfg=15 gui=none guibg=#1E1E1E guifg=#F7F7F7 +hi Visual cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#3C3C3C guifg=#F7F7F7 +hi NonText cterm=none ctermbg=0 ctermfg=0 gui=none guibg=#1E1E1E guifg=#1E1E1E +hi Error cterm=none ctermbg=1 ctermfg=7 gui=bold guibg=#1E1E1E guifg=#A94744 +hi ErrorMsg cterm=none ctermbg=1 ctermfg=7 gui=bold guibg=#1E1E1E guifg=#A94744 +hi Todo cterm=none ctermbg=1 ctermfg=3 gui=bold guibg=#1E1E1E guifg=#D69831 +hi Repeat cterm=bold ctermbg=0 ctermfg=1 gui=bold guibg=#1E1E1E guifg=#A94744 + +" Completion menu +hi Pmenu cterm=none ctermbg=8 ctermfg=7 gui=none guibg=#3C3C3C guifg=#B0B0B0 +hi PmenuSel cterm=none ctermbg=4 ctermfg=15 gui=none guibg=#569CD6 guifg=#F7F7F7 +hi PmenuSbar cterm=none ctermbg=4 ctermfg=15 gui=none guibg=#569CD6 guifg=#F7F7F7 + +" Spelling +hi SpellBad cterm=underline ctermbg=0 ctermfg=9 gui=none guibg=#1E1E1E guifg=#E09690 +hi SpellCap cterm=underline ctermbg=0 ctermfg=9 gui=none guibg=#1E1E1E guifg=#E09690 +hi SpellRare cterm=underline ctermbg=0 ctermfg=9 gui=none guibg=#1E1E1E guifg=#E09690 +hi SpellLocal cterm=underline ctermbg=0 ctermfg=9 gui=none guibg=#1E1E1E guifg=#E09690 + +" Diff +hi DiffAdd cterm=none ctermbg=2 ctermfg=10 gui=none guibg=#608B4E guifg=#B5F2A1 +hi DiffChange cterm=none ctermbg=4 ctermfg=12 gui=none guibg=#569CD6 guifg=#CEEDFE +hi DiffDelete cterm=none ctermbg=1 ctermfg=9 gui=none guibg=#A94744 guifg=#FFBDB8 +hi DiffText cterm=none ctermbg=3 ctermfg=11 gui=none guibg=#D69831 guifg=#FFD887 + +" General language constructs +hi Statement cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Keyword cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Comment cterm=none ctermbg=0 ctermfg=2 gui=italic guibg=#1E1E1E guifg=#608B4E +hi Special cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Delimiter cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 + +" C syntax highlighting +hi PreProc cterm=none ctermbg=0 ctermfg=5 gui=none guibg=#1E1E1E guifg=#B06386 +hi Include cterm=none ctermbg=0 ctermfg=5 gui=none guibg=#1E1E1E guifg=#B06386 +hi Define cterm=none ctermbg=0 ctermfg=5 gui=none guibg=#1E1E1E guifg=#B06386 +hi Macro cterm=none ctermbg=0 ctermfg=5 gui=none guibg=#1E1E1E guifg=#B06386 +hi PreCondit cterm=none ctermbg=0 ctermfg=5 gui=none guibg=#1E1E1E guifg=#B06386 +hi Type cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi String cterm=none ctermbg=0 ctermfg=3 gui=none guibg=#1E1E1E guifg=#D69831 +hi Method cterm=none ctermbg=0 ctermfg=11 gui=none guibg=#1E1E1E guifg=#F8BC41 +hi Function cterm=none ctermbg=0 ctermfg=11 gui=none guibg=#1E1E1E guifg=#F8BC41 +hi Symbol cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Structure cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi StorageClass cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Typedef cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Identifier cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Constant cterm=none ctermbg=0 ctermfg=4 gui=none guibg=#1E1E1E guifg=#569CD6 +hi Number cterm=none ctermbg=0 ctermfg=2 gui=none guibg=#1E1E1E guifg=#608B4E