tomru/DotfilesOld
1
0
Fork 0
mirror of https://github.com/tomru/DotfilesOld.git synced 2026-03-04 06:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into everard

Browse Source
This commit is contained in:
Thomas Ruoff
2015-02-16 09:16:05 +01:00
parent e6c67a8bc6 bdd8a04576
commit 4541e007c2
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tmux.conf
View File

@@ -59,32 +59,31 @@ set -g mouse-select-pane on
set -g mouse-select-window on set -g mouse-select-window on
# This tmux statusbar config was created by tmuxline.vim # This tmux statusbar config was created by tmuxline.vim
# on Mon, 15 Dec 2014 # on Sun, 15 Feb 2015
set -g status-bg "colour234" set -g status-bg "colour235"
set -g message-command-fg "colour231" set -g message-command-fg "colour230"
set -g status-justify "left" set -g status-justify "left"
set -g status-left-length "100" set -g status-left-length "100"
set -g status "on" set -g status "on"
set -g pane-active-border-fg "colour254" set -g pane-active-border-fg "colour33"
set -g message-bg "colour31" set -g message-bg "colour239"
set -g status-right-length "100" set -g status-right-length "100"
set -g status-right-attr "none" set -g status-right-attr "none"
set -g message-fg "colour231" set -g message-fg "colour230"
set -g message-command-bg "colour31" set -g message-command-bg "colour239"
set -g status-attr "none" set -g status-attr "none"
set -g status-utf8 "on" set -g status-utf8 "on"
set -g pane-border-fg "colour240" set -g pane-border-fg "colour239"
set -g status-left-attr "none" set -g status-left-attr "none"
setw -g window-status-fg "colour250" setw -g window-status-fg "colour245"
setw -g window-status-attr "none" setw -g window-status-attr "none"
setw -g window-status-activity-bg "colour234" setw -g window-status-activity-bg "colour235"
setw -g window-status-activity-attr "none" setw -g window-status-activity-attr "none"
setw -g window-status-activity-fg "colour250" setw -g window-status-activity-fg "colour33"
setw -g window-status-separator "" setw -g window-status-separator ""
setw -g window-status-bg "colour234" setw -g window-status-bg "colour235"
set -g status-left "#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold,nounderscore,noitalics]>" set -g status-left "#[fg=colour230,bg=colour33] #S "
set -g status-right "#[fg=colour236,bg=colour234,nobold,nounderscore,noitalics]<#[fg=colour247,bg=colour236] %Y-%m-%d < %H:%M #[fg=colour252,bg=colour236,nobold,nounderscore,noitalics]<#[fg=colour235,bg=colour252] #h " set -g status-right "#[fg=colour245,bg=colour239] %Y-%m-%d %H:%M #[fg=colour235,bg=colour244] #h "
setw -g window-status-format "#[fg=colour244,bg=colour234] #I <#[fg=colour250,bg=colour234] #W " setw -g window-status-format "#[fg=colour245,bg=colour235] #I #[fg=colour245,bg=colour235] #W "
setw -g window-status-current-format "#[fg=colour234,bg=colour31,nobold,nounderscore,noitalics]>#[fg=colour117,bg=colour31] #I >#[fg=colour231,bg=colour31,bold] #W #[fg=colour31,bg=colour234,nobold,nounderscore,noitalics]>" setw -g window-status-current-format "#[fg=colour230,bg=colour239] #I #[fg=colour230,bg=colour239] #W "

26
vimrc
View File

@@ -42,7 +42,7 @@ NeoBundle 'rking/ag.vim'
NeoBundle 'christoomey/vim-tmux-navigator' NeoBundle 'christoomey/vim-tmux-navigator'
NeoBundle 'vim-airline' NeoBundle 'itchyny/lightline.vim'
NeoBundle 'chriskempson/base16-vim' NeoBundle 'chriskempson/base16-vim'
NeoBundle 'scrooloose/syntastic.git' NeoBundle 'scrooloose/syntastic.git'
@@ -66,6 +66,9 @@ NeoBundleCheck
" other stuff " other stuff
"" reload when vim config changes
autocmd! bufwritepost .vimrc source %
"" Encoding "" Encoding
set encoding=utf-8 set encoding=utf-8
set fileencoding=utf-8 set fileencoding=utf-8
@@ -103,7 +106,6 @@ set showcmd
"" Mouse "" Mouse
set mouse=a set mouse=a
set ttymouse=urxvt
" "
" Visual Settings " Visual Settings
@@ -248,12 +250,20 @@ endif
let g:syntastic_javascript_checkers = ['jshint','jscs'] let g:syntastic_javascript_checkers = ['jshint','jscs']
let g:syntastic_check_on_open = 1 let g:syntastic_check_on_open = 1
"" ariline "" lightline
let g:airline_theme = 'bubblegum' let g:lightline = {
let g:airline_left_sep = '»' \ 'colorscheme': 'solarized',
let g:airline_right_sep = '«' \ 'active': {
let g:airline_enable_syntastic = 1 \ 'left': [ [ 'mode', 'paste' ],
let g:airline#extensions#tabline#enabled = 1 \ [ 'fugitive', 'readonly', 'filename', 'modified' ] ]
\ },
\ 'component': {
\ 'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}'
\ },
\ 'component_visible_condition': {
\ 'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())'
\ }
\}
"" NERDTree configuration "" NERDTree configuration
nmap <leader>n :NERDTreeToggle<CR> nmap <leader>n :NERDTreeToggle<CR>