solarized ftw

tmux.conf

@@ -1,12 +1,12 @@
+# Use a 256 color terminal
+set -g default-terminal "screen-256color"
+
 # zsh
 set-option -g default-shell $SHELL
 
 # reparing copy & paste
 set-option -g default-command "reattach-to-user-namespace -l zsh"
 
-# Use a 256 color terminal
-set -g default-terminal "screen-256color"
-
 # Fix for sending keys to Vim
 setw -g xterm-keys on
 
@@ -67,25 +67,31 @@ setw -g pane-base-index 1
 # How long should we show any messages?
 set -g display-time 2000
 
-# Statusbar
-set -g status-fg white
-set -g status-bg colour234
-set -g window-status-activity-attr bold
-set -g pane-border-fg colour245
-set -g pane-active-border-fg colour39
-set -g message-fg colour16
-set -g message-bg colour221
-set -g message-attr bold
-
-# Custom status bar
-# Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
+
+# default statusbar colors / solarized dark
+set-option -g status-bg black 
+set-option -g status-fg yellow
+set-option -g status-attr default
+set-window-option -g window-status-fg brightblue
+set-window-option -g window-status-bg default
+set-window-option -g window-status-current-fg brightred
+set-window-option -g window-status-current-bg default
+set-option -g pane-border-fg black
+set-option -g pane-active-border-fg brightgreen
+set-option -g message-bg black
+set-option -g message-fg brightred
+set-option -g display-panes-active-colour blue
+set-option -g display-panes-colour brightred
+set-window-option -g clock-mode-colour green
+
+
+# Custom status bar - Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
 set -g status-left-length 32
 set -g status-right-length 150
 set -g status-interval 5
-
 set -g status-left-length 60
-set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] ⣿ #P #[fg=colour238,bg=colour234,nobold]⮀'
-set -g status-right '#[fg=colour238,bg=colour234,nobold]⮂#[fg=colour245,bg=colour238] #(whoami)@#h #[fg=colour252]⮂#[fg=colour235,bg=colour252,bold] ○ #(date +"%H:%M") '
-set -g window-status-format "#[fg=white,bg=colour234] #I #W "
-set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour25,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
+set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] ⣿ #P #[fg=colour238,bg=default,nobold]⮀'
+set -g status-right '#[fg=colour238,bg=default,nobold]⮂#[fg=colour245,bg=colour238] #(whoami)@#h #[fg=colour252]⮂#[fg=colour235,bg=colour252,bold] ○ #(date +"%H:%M") '
+set -g window-status-format "#[fg=base0,bg=default] #I #W "
+set -g window-status-current-format "#[fg=black,bg=brightred]⮀#[fg=colour251,bg=brightred,noreverse,bold] #I ⮁ #W #[fg=brightred,bg=black,nobold]⮀"
 

vim/snippets/css.snippets

@@ -106,9 +106,10 @@ endsnippet
 
 snippet bd "border"
 border: ${1:1}px solid ${2:\$color-main};$0
+endsnippet
 
 snippet bdt "border-top"
-border-top: ${1:1}px ${2:solid} ${3:\$color-main};$0
+border-top: ${1:1}px ${2:solid} ${3:$color-main};$0
 endsnippet
 
 snippet bdb "border-right"

vimrc

@@ -17,7 +17,6 @@ Bundle 'Lokaltog/vim-powerline'
 Bundle 'Raimondi/delimitMate'
 Bundle 'SirVer/ultisnips'
 Bundle 'Valloric/YouCompleteMe'
-Bundle 'airblade/vim-gitgutter'
 Bundle 'chrisbra/NrrwRgn'
 Bundle 'editorconfig/editorconfig-vim'
 Bundle 'edsono/vim-matchit'
@@ -42,7 +41,6 @@ Bundle 'tpope/vim-repeat'
 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'tristen/vim-sparkup'
-Bundle 'vim-scripts/ZoomWin'
 
 
 " Additional syntaxes
@@ -59,10 +57,12 @@ Bundle 'webgefrickel/vim-typoscript'
 " Color themes
 Bundle 'Lokaltog/vim-distinguished'
 Bundle 'jaromero/vim-monokai-refined'
-Bundle 'morhetz/gruvbox'
 Bundle 'nanotech/jellybeans.vim'
-Bundle 'sjl/badwolf'
 Bundle 'zeis/vim-kolor'
+Bundle 'morhetz/gruvbox'
+Bundle 'altercation/vim-colors-solarized'
+Bundle 'wgibbs/vim-irblack'
+Bundle 'stephenmckinney/vim-solarized-powerline'
 
 
 " and reset auto-filetype after loading all bundles
@@ -119,9 +119,10 @@ if &term =~ '^screen'
   " map <Esc>[B <Down>
 endif
 
-" color options
-set bg=dark
-colorscheme jellybeans
+
+let g:solarized_visibility = 'low'
+set background=dark
+colorscheme solarized
 
 set fillchars=""
 
@@ -205,6 +206,9 @@ nnoremap <leader><space> :noh<cr>
 nnoremap <leader>\ <C-w>v<C-w>l
 nnoremap <leader>- <C-w>s<C-w>j
 
+" open a new split and edit the vimrc
+nnoremap <leader>v <C-w>v<C-w>l :e ~/.vimrc<cr>
+
 " Opens an edit command with the path of the currently edited file filled in
 nnoremap <leader>e :e <C-R>=expand("%:p:h") . "/" <CR>
 
@@ -270,7 +274,7 @@ nnoremap <F5> :checktime<cr>
 
 " ========== PLugins leaders and other config ==========
 " search using Ag - the Silver Surfer ftw!
-nnoremap <leader>a :Ag
+nnoremap <leader>a :Ag 
 
 " Nerdtree toggle
 nnoremap <leader>n :NERDTreeToggle<cr>
@@ -279,14 +283,30 @@ let NERDTreeWinSize=50
 let NERDTreeShowHidden=1
 
 " fugitive shortcuts -- 20+ increases window-height
-nmap <leader>gs :Gstatus<CR><C-w>20+
-nmap <leader>gg :Gcommit<CR><C-w>20+
+nnoremap <silent> <leader>gs :Gstatus<CR><C-w>20+
+nnoremap <silent> <leader>gd :Gdiff<CR><C-w>20+
+nnoremap <silent> <leader>gc :Gcommit<CR><C-w>20+
+nnoremap <silent> <leader>gb :Gblame<CR><C-w>20+
+nnoremap <silent> <leader>gl :Glog<CR><C-w>20+
+nnoremap <silent> <leader>gp :Git push<CR><C-w>20+
+nnoremap <silent> <leader>gw :Gwrite<CR><C-w>20+
 
 " TComment
 nnoremap <leader>/ :TComment<CR>
 vnoremap <leader>/ :TComment<CR>
 inoremap <leader>/ <Esc>:TComment<CR>i
 
+" Tabularize
+nmap <Leader>a= :Tabularize /=<CR>
+vmap <Leader>a= :Tabularize /=<CR>
+nmap <Leader>a: :Tabularize /:<CR>
+vmap <Leader>a: :Tabularize /:<CR>
+nmap <Leader>a, :Tabularize /,<CR>
+vmap <Leader>a, :Tabularize /,<CR>
+nmap <Leader>a<Bar> :Tabularize /<Bar><CR>
+vmap <Leader>a<Bar> :Tabularize /<Bar><CR>
+
+
 " easymotion config leader m
 let g:EasyMotion_leader_key = '<leader>m'
 
@@ -351,6 +371,7 @@ let g:gist_detect_filetype = 1
 " Powerline customization
 let g:Powerline_symbols = 'fancy'
 let g:Powerline_stl_path_style = 'short'
+let g:Powerline_colorscheme = 'solarized256_dark'
 call Pl#Theme#RemoveSegment('scrollpercent')
 
 

zshrc

@@ -8,6 +8,9 @@ plugins=(brew extract git github history-substring-search jake-node npm node gem
 source $ZSH/oh-my-zsh.sh
 unsetopt correct_all
 
+# Terminal
+export TERM="screen-256color"
+
 # paths
 export PATH=/usr/local/bin:/usr/local/sbin:$HOME/.rvm/bin:$PATH
 export MANPATH=/usr/local/share/man:$MANPATH
@@ -88,7 +91,7 @@ alias grw='grunt watch'
 alias grd='grunt deploy'
 
 # other tools
-alias t='tmux -u'
+alias t='tmux -u -2'
 alias ta='tmux attach'
 
 # rvm ftw!