Merge branch 'master' of git.epichack.com:barak/dotfiles

.config/awesome/rc.lua

@@ -360,7 +360,7 @@ globalkeys = awful.util.table.join(
     -- Prompt
     awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
 
-    awful.key({ modkey }, "x",
+    awful.key({ modkey, "Shift" }, "x",
               function ()
                   awful.prompt.run({ prompt = "Run Lua code: " },
                   mypromptbox[mouse.screen].widget,

.emacs.d/init.el

@@ -8,6 +8,13 @@
 (add-to-list 'load-path "~/.emacs.d/tabbar")
 (add-to-list 'load-path "~/.emacs.d/evil")
 
+(require 'package)
+(when (< emacs-major-version 24)
+  (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
+(add-to-list 'package-archives
+             '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(package-initialize)
+
 
 (fset 'yes-or-no-p 'y-or-n-p)
 
@@ -22,7 +29,9 @@
 (require 'tabbar)
 ;(require 'highlight-symbol)
 (require 'auto-complete-config)
+(require 'cl)
 (evil-mode 1)
+(eval-after-load 'flymake '(require 'flymake-cursor))
 
 
 ;; Hack to get *Messages* in viper-mode.
@@ -86,6 +95,9 @@
 ;(vimpulse-map "gK" 'kill-buffer-and-window)
 ;(vimpulse-map "gc" 'kill-buffer-and-window)
 ;(define-key viper-insert-global-user-map "\C-d" 'delete-char))
+(define-key evil-normal-state-map "gn" 'tabbar-forward-tab)
+(define-key evil-normal-state-map "gp" 'tabbar-backward-tab)
+(define-key evil-normal-state-map "gc" 'kill-buffer-and-window)
 
 (add-hook 'window-setup-hook 'delete-other-windows)
 

.gitmodules

@@ -73,3 +73,6 @@
 [submodule ".vim/bundle/ctrlp"]
 	path = .vim/bundle/ctrlp
 	url = https://github.com/kien/ctrlp.vim.git
+[submodule ".vim/bundle/vim-bufferline"]
+	path = .vim/bundle/vim-bufferline
+	url = https://github.com/bling/vim-bufferline

.vim/autoload/airline/themes/barak.vim

@@ -0,0 +1,58 @@
+" vim-airline companion theme of Ubaryd
+" (https://github.com/Donearm/Ubaryd)
+
+" Normal mode
+let s:N1 = [ '#141413' , '#c7b386' , 232 , 252 ] " blackestgravel & bleaksand
+let s:N2 = [ '#c7b386' , '#45413b' , 252, 238 ] " bleaksand & deepgravel
+let s:N3 = [ '#b88853' , '#363946' , 137, 237 ] " toffee & darkgravel
+let s:N4 = [ '#363946' , 237 ] " gravel
+
+" Insert mode
+let s:I1 = [ '#1a1a18' , '#fade3e' , 232 , 221 ] " blackestgravel & warmcorn
+let s:I2 = [ '#c7b386' , '#45413b' , 252 , 238 ] " bleaksand & deepgravel
+let s:I3 = [ '#f4cf86' , '#242321' , 222 , 235 ] " lighttannedskin & darkgravel
+
+" Visual mode
+let s:V1 = [ '#1c1b1a' , '#9a4820' , 233 , 88 ] " blackgravel & warmadobe
+let s:V2 = [ '#000000' , '#88633f' , 16 , 95 ] " coal & cappuccino
+let s:V3 = [ '#88633f' , '#c7b386' , 95 , 252 ] " cappuccino & bleaksand
+let s:V4 = [ '#c14c3d' , 160 ] " tannedumbrella
+
+" Replace mode
+let s:RE = [ '#c7915b' , 173 ] " nut
+
+" Paste mode
+let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
+
+let s:file = [ '#ff7400' , '' , 196 , '' , '' ]
+let s:IA = [ '#767986', '#363946', 244, 237, '' ]	
+
+let g:airline#themes#barak#palette = {}
+let g:airline#themes#barak#palette.inactive = {
+      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
+
+
+let g:airline#themes#barak#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#barak#palette.normal_modified = {
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
+
+
+let g:airline#themes#barak#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#barak#palette.insert_modified = {
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
+let g:airline#themes#barak#palette.insert_paste = {
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
+
+
+let g:airline#themes#barak#palette.replace = copy(airline#themes#barak#palette.insert)
+let g:airline#themes#barak#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#barak#palette.replace_modified = g:airline#themes#barak#palette.insert_modified
+
+
+let g:airline#themes#barak#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#barak#palette.visual_modified = {
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
+
+let g:airline#themes#barak#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+

.vim/bundle/YouCompleteMe

@@ -1 +1 @@
-Subproject commit 527d98028bb00167acf9acd89f7129c229c26025
+Subproject commit d2fe03f0724d36ed75867e66150074930e2f3f2e

.vim/bundle/vim-airline

@@ -1 +1 @@
-Subproject commit c98549913c19b9db632bc214bc4266a17fa103ae
+Subproject commit 1f6b936dd8454262cfd4effe42210f049891cff6

.vim/bundle/vim-bufferline

@@ -0,0 +1 @@
+Subproject commit 526e4e2c58d317f88ae84298922c2915bd0b1ecb

.vim/bundle/vim-coffee-script

@@ -1 +1 @@
-Subproject commit 0e38ef90446a0f1f2294b6225c9c97dbc2810b45
+Subproject commit d944c79848a29ac58cc1e435e81a795bb6d16c18

.vim/bundle/vim-gocode

@@ -1 +1 @@
-Subproject commit 7b07ccdc64afb8a4eced064901b63dbfca1e4a64
+Subproject commit 1d6e94805679eeb7c27391e6eebc8067ff1d543a

.vimrc

@@ -137,7 +137,13 @@ let g:LustyJugglerShowKeys = 'a'
 " * Buftabs
 let g:buftabs_only_basename = 1
 "let g:buftabs_in_statusline=1
-"
+
+" Bufferline
+let g:bufferline_echo = 0
+let g:bufferline_modified = '+'
+let g:bufferline_show_bufnr = 1
+let g:bufferline_rotate = 1
+
 " * NERDTree
 let g:NERDChristmasTree = 1
 let g:NERDChristmasTree = 1
@@ -194,12 +200,18 @@ set noshowmode
 let g:airline_enable_branch = 1
 let g:airline_enable_syntastic = 1
 let g:airline_enable_tagbar = 1
-let g:airline_theme="ubaryd"
+let g:airline_theme="barak"
+let g:airline_left_sep = ''
+let g:airline_right_sep = ''
+let g:airline#extensions#syntastic#enabled = 1
+let g:airline#extensions#hunks#non_zero_only = 1
+let g:airline#extensions#whitespace#enabled = 0
 
 " * CtrlP
 let g:ctrlp_map = ',t'
 let g:ctrlp_cmd = 'CtrlP'
 let g:ctrlp_working_path_mode = 'ra'
+let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
 
 
 " ** STATUSLINE **
@@ -434,9 +446,10 @@ nnoremap <Leader>ac :Ack
 nnoremap <Leader>hh :A<CR>
 " CommandT is useful, but if I'm juggling lots of buffers, limit it to another
 " one I have open (instead of standard <Leader>t).
-nnoremap <silent> <Leader>o :CommandTBuffer<CR>
+nnoremap <silent> <Leader>o :CtrlPBuffer<CR>
 nnoremap <Leader>j <C-^>
-nnoremap <Leader>p  :PTW 
+"nnoremap <Leader>p  :PTW 
+nnoremap <Leader>p  :LustyJugglePrevious<CR>
 
 " ** EXTRA INCLUDES **
 "