diff --git a/.iterm2/com.googlecode.iterm2.plist b/.iterm2/com.googlecode.iterm2.plist
index 2036720..5a3784e 100644
--- a/.iterm2/com.googlecode.iterm2.plist
+++ b/.iterm2/com.googlecode.iterm2.plist
@@ -28,6 +28,219 @@
CopySelection
+ Custom Color Presets
+
+ hybrid
+
+ Ansi 0 Color
+
+ Blue Component
+ 0.13229149580001831
+ Green Component
+ 0.12323731929063797
+ Red Component
+ 0.11772859841585159
+
+ Ansi 1 Color
+
+ Blue Component
+ 0.19966201484203339
+ Green Component
+ 0.18515877425670624
+ Red Component
+ 0.5740046501159668
+
+ Ansi 10 Color
+
+ Blue Component
+ 0.33485174179077148
+ Green Component
+ 0.69721812009811401
+ Red Component
+ 0.65277093648910522
+
+ Ansi 11 Color
+
+ Blue Component
+ 0.38143736124038696
+ Green Component
+ 0.73312276601791382
+ Red Component
+ 0.92229294776916504
+
+ Ansi 12 Color
+
+ Blue Component
+ 0.69104295969009399
+ Green Component
+ 0.56590473651885986
+ Red Component
+ 0.43420237302780151
+
+ Ansi 13 Color
+
+ Blue Component
+ 0.67776411771774292
+ Green Component
+ 0.49912372231483459
+ Red Component
+ 0.63456809520721436
+
+ Ansi 14 Color
+
+ Blue Component
+ 0.65990132093429565
+ Green Component
+ 0.69651854038238525
+ Red Component
+ 0.47394692897796631
+
+ Ansi 15 Color
+
+ Blue Component
+ 0.72799122333526611
+ Green Component
+ 0.73772752285003662
+ Red Component
+ 0.72378784418106079
+
+ Ansi 2 Color
+
+ Blue Component
+ 0.19350560009479523
+ Green Component
+ 0.51718360185623169
+ Red Component
+ 0.47679561376571655
+
+ Ansi 3 Color
+
+ Blue Component
+ 0.30180639028549194
+ Green Component
+ 0.50180763006210327
+ Red Component
+ 0.83306139707565308
+
+ Ansi 4 Color
+
+ Blue Component
+ 0.54611688852310181
+ Green Component
+ 0.42857363820075989
+ Red Component
+ 0.3033672571182251
+
+ Ansi 5 Color
+
+ Blue Component
+ 0.48750758171081543
+ Green Component
+ 0.32038700580596924
+ Red Component
+ 0.44386249780654907
+
+ Ansi 6 Color
+
+ Blue Component
+ 0.45474731922149658
+ Green Component
+ 0.48341637849807739
+ Red Component
+ 0.30198413133621216
+
+ Ansi 7 Color
+
+ Blue Component
+ 0.42652279138565063
+ Green Component
+ 0.3944053053855896
+ Red Component
+ 0.36455416679382324
+
+ Ansi 8 Color
+
+ Blue Component
+ 0.19518557190895081
+ Green Component
+ 0.17529888451099396
+ Red Component
+ 0.16332042217254639
+
+ Ansi 9 Color
+
+ Blue Component
+ 0.32692217826843262
+ Green Component
+ 0.31278485059738159
+ Red Component
+ 0.74731773138046265
+
+ Background Color
+
+ Blue Component
+ 0.097707755863666534
+ Green Component
+ 0.092142701148986816
+ Red Component
+ 0.086937598884105682
+
+ Bold Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+ Cursor Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+ Cursor Text Color
+
+ Blue Component
+ 0.13528014719486237
+ Green Component
+ 0.12312769144773483
+ Red Component
+ 0.11772145330905914
+
+ Foreground Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+ Selected Text Color
+
+ Blue Component
+ 0.097707755863666534
+ Green Component
+ 0.092142701148986816
+ Red Component
+ 0.086937598884105682
+
+ Selection Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+
+
Default Bookmark Guid
B5770A01-18BD-499A-81BD-021279F4BC55
DimBackgroundWindows
@@ -83,7 +296,9 @@
MaxVertically
NSNavLastRootDirectory
- ~/Documents
+ ~/.iterm2
+ NSNavPanelExpandedSizeForOpenMode
+ {712, 448}
NSQuotedKeystrokeBinding
NSRepeatCountBinding
@@ -108,11 +323,13 @@
NSTableView Sort Ordering KeyBingingTable
NSWindow Frame Preferences
- 270 110 924 485 0 0 1920 1178
+ 269 110 924 485 0 0 1440 877
NSWindow Frame iTerm Window 0
- 226 163 1210 866 0 0 1920 1178
+ 183 280 850 586 0 0 1440 877
NSWindow Frame iTerm Window 1
- 225 39 1210 866 0 0 1920 1178
+ 183 280 850 586 0 0 1440 877
+ NSWindow Frame iTerm Window 2
+ 183 291 850 586 0 0 1440 877
New Bookmarks
@@ -125,146 +342,146 @@
Ansi 0 Color
Blue Component
- 0.0
+ 0.13229149580001831
Green Component
- 0.0
+ 0.12323731929063797
Red Component
- 0.0
+ 0.11772859841585159
Ansi 1 Color
Blue Component
- 0.0
+ 0.19966201484203339
Green Component
- 0.0
+ 0.18515877425670624
Red Component
- 0.73333334922790527
+ 0.5740046501159668
Ansi 10 Color
Blue Component
- 0.3333333432674408
+ 0.33485174179077148
Green Component
- 1
+ 0.69721812009811401
Red Component
- 0.3333333432674408
+ 0.65277093648910522
Ansi 11 Color
Blue Component
- 0.3333333432674408
+ 0.38143736124038696
Green Component
- 1
+ 0.73312276601791382
Red Component
- 1
+ 0.92229294776916504
Ansi 12 Color
Blue Component
- 1
+ 0.69104295969009399
Green Component
- 0.3333333432674408
+ 0.56590473651885986
Red Component
- 0.3333333432674408
+ 0.43420237302780151
Ansi 13 Color
Blue Component
- 1
+ 0.67776411771774292
Green Component
- 0.3333333432674408
+ 0.49912372231483459
Red Component
- 1
+ 0.63456809520721436
Ansi 14 Color
Blue Component
- 1
+ 0.65990132093429565
Green Component
- 1
+ 0.69651854038238525
Red Component
- 0.3333333432674408
+ 0.47394692897796631
Ansi 15 Color
Blue Component
- 1
+ 0.72799122333526611
Green Component
- 1
+ 0.73772752285003662
Red Component
- 1
+ 0.72378784418106079
Ansi 2 Color
Blue Component
- 0.0
+ 0.19350560009479523
Green Component
- 0.73333334922790527
+ 0.51718360185623169
Red Component
- 0.0
+ 0.47679561376571655
Ansi 3 Color
Blue Component
- 0.0
+ 0.30180639028549194
Green Component
- 0.73333334922790527
+ 0.50180763006210327
Red Component
- 0.73333334922790527
+ 0.83306139707565308
Ansi 4 Color
Blue Component
- 0.73333334922790527
+ 0.54611688852310181
Green Component
- 0.0
+ 0.42857363820075989
Red Component
- 0.0
+ 0.3033672571182251
Ansi 5 Color
Blue Component
- 0.73333334922790527
+ 0.48750758171081543
Green Component
- 0.0
+ 0.32038700580596924
Red Component
- 0.73333334922790527
+ 0.44386249780654907
Ansi 6 Color
Blue Component
- 0.73333334922790527
+ 0.45474731922149658
Green Component
- 0.73333334922790527
+ 0.48341637849807739
Red Component
- 0.0
+ 0.30198413133621216
Ansi 7 Color
Blue Component
- 0.73333334922790527
+ 0.42652279138565063
Green Component
- 0.73333334922790527
+ 0.3944053053855896
Red Component
- 0.73333334922790527
+ 0.36455416679382324
Ansi 8 Color
Blue Component
- 0.48716771602630615
+ 0.19518557190895081
Green Component
- 0.48716771602630615
+ 0.17529888451099396
Red Component
- 0.48716771602630615
+ 0.16332042217254639
Ansi 9 Color
Blue Component
- 0.3333333432674408
+ 0.32692217826843262
Green Component
- 0.3333333432674408
+ 0.31278485059738159
Red Component
- 1
+ 0.74731773138046265
Automatically Log
@@ -273,11 +490,11 @@
Background Color
Blue Component
- 0.0
+ 0.097707755863666534
Green Component
- 0.0
+ 0.092142701148986816
Red Component
- 0.0
+ 0.086937598884105682
Background Image Is Tiled
@@ -296,11 +513,11 @@
Bold Color
Blue Component
- 1
+ 0.729411780834198
Green Component
- 1
+ 0.73725491762161255
Red Component
- 1
+ 0.72156864404678345
Character Encoding
4
@@ -313,20 +530,20 @@
Cursor Color
Blue Component
- 0.73333334922790527
+ 0.729411780834198
Green Component
- 0.73333334922790527
+ 0.73725491762161255
Red Component
- 0.73333334922790527
+ 0.72156864404678345
Cursor Text Color
Blue Component
- 1
+ 0.13528014719486237
Green Component
- 1
+ 0.12312769144773483
Red Component
- 1
+ 0.11772145330905914
Cursor Type
2
@@ -347,11 +564,11 @@
Foreground Color
Blue Component
- 1
+ 0.729411780834198
Green Component
- 1
+ 0.73725491762161255
Red Component
- 1
+ 0.72156864404678345
Guid
B5770A01-18BD-499A-81BD-021279F4BC55
@@ -588,20 +805,20 @@
Selected Text Color
Blue Component
- 0.0
+ 0.097707755863666534
Green Component
- 0.0
+ 0.092142701148986816
Red Component
- 0.0
+ 0.086937598884105682
Selection Color
Blue Component
- 0.7578655481338501
+ 0.729411780834198
Green Component
- 0.7578655481338501
+ 0.73725491762161255
Red Component
- 0.7578655481338501
+ 0.72156864404678345
Semantic History
@@ -744,9 +961,9 @@
NoSyncTimeOfLastPromo
- 464690275.89469802
+ 464721296.71882403
NoSyncTimeOfLastPromoDownload
- 464690275.89472401
+ 467580570.19095999
OnlyWhenMoreTabs
OpenArrangementAtStartup
@@ -805,11 +1022,11 @@
SUEnableAutomaticChecks
SUFeedURL
- http://iterm2.com/appcasts/testing.xml
+ https://iterm2.com/appcasts/testing.xml
SUHasLaunchedBefore
SULastCheckTime
- 2015-09-23T08:37:21Z
+ 2015-10-26T19:29:24Z
SavePasteHistory
ShowBookmarkName
@@ -855,6 +1072,6 @@
findRegex_iTerm
iTerm Version
- 2.1.1
+ 2.1.4
diff --git a/.iterm2/hybrid.itermcolors b/.iterm2/hybrid.itermcolors
new file mode 100644
index 0000000..01e3758
--- /dev/null
+++ b/.iterm2/hybrid.itermcolors
@@ -0,0 +1,213 @@
+
+
+
+
+ Ansi 0 Color
+
+ Blue Component
+ 0.13229149580001831
+ Green Component
+ 0.12323731929063797
+ Red Component
+ 0.11772859841585159
+
+ Ansi 1 Color
+
+ Blue Component
+ 0.19966201484203339
+ Green Component
+ 0.18515877425670624
+ Red Component
+ 0.5740046501159668
+
+ Ansi 10 Color
+
+ Blue Component
+ 0.33485174179077148
+ Green Component
+ 0.69721812009811401
+ Red Component
+ 0.65277093648910522
+
+ Ansi 11 Color
+
+ Blue Component
+ 0.38143736124038696
+ Green Component
+ 0.73312276601791382
+ Red Component
+ 0.92229294776916504
+
+ Ansi 12 Color
+
+ Blue Component
+ 0.69104295969009399
+ Green Component
+ 0.56590473651885986
+ Red Component
+ 0.43420237302780151
+
+ Ansi 13 Color
+
+ Blue Component
+ 0.67776411771774292
+ Green Component
+ 0.49912372231483459
+ Red Component
+ 0.63456809520721436
+
+ Ansi 14 Color
+
+ Blue Component
+ 0.65990132093429565
+ Green Component
+ 0.69651854038238525
+ Red Component
+ 0.47394692897796631
+
+ Ansi 15 Color
+
+ Blue Component
+ 0.72799122333526611
+ Green Component
+ 0.73772752285003662
+ Red Component
+ 0.72378784418106079
+
+ Ansi 2 Color
+
+ Blue Component
+ 0.19350560009479523
+ Green Component
+ 0.51718360185623169
+ Red Component
+ 0.47679561376571655
+
+ Ansi 3 Color
+
+ Blue Component
+ 0.30180639028549194
+ Green Component
+ 0.50180763006210327
+ Red Component
+ 0.83306139707565308
+
+ Ansi 4 Color
+
+ Blue Component
+ 0.54611688852310181
+ Green Component
+ 0.42857363820075989
+ Red Component
+ 0.3033672571182251
+
+ Ansi 5 Color
+
+ Blue Component
+ 0.48750758171081543
+ Green Component
+ 0.32038700580596924
+ Red Component
+ 0.44386249780654907
+
+ Ansi 6 Color
+
+ Blue Component
+ 0.45474731922149658
+ Green Component
+ 0.48341637849807739
+ Red Component
+ 0.30198413133621216
+
+ Ansi 7 Color
+
+ Blue Component
+ 0.42652279138565063
+ Green Component
+ 0.3944053053855896
+ Red Component
+ 0.36455416679382324
+
+ Ansi 8 Color
+
+ Blue Component
+ 0.19518557190895081
+ Green Component
+ 0.17529888451099396
+ Red Component
+ 0.16332042217254639
+
+ Ansi 9 Color
+
+ Blue Component
+ 0.32692217826843262
+ Green Component
+ 0.31278485059738159
+ Red Component
+ 0.74731773138046265
+
+ Background Color
+
+ Blue Component
+ 0.097707755863666534
+ Green Component
+ 0.092142701148986816
+ Red Component
+ 0.086937598884105682
+
+ Bold Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+ Cursor Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+ Cursor Text Color
+
+ Blue Component
+ 0.13528014719486237
+ Green Component
+ 0.12312769144773483
+ Red Component
+ 0.11772145330905914
+
+ Foreground Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+ Selected Text Color
+
+ Blue Component
+ 0.097707755863666534
+ Green Component
+ 0.092142701148986816
+ Red Component
+ 0.086937598884105682
+
+ Selection Color
+
+ Blue Component
+ 0.72941176470588232
+ Green Component
+ 0.73725490196078436
+ Red Component
+ 0.72156862745098038
+
+
+
diff --git a/.vimrc b/.vimrc
index 10d3d6e..e23531f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -17,8 +17,9 @@ Plugin 'tpope/vim-commentary'
Plugin 'tpope/vim-surround'
Plugin 'scrooloose/syntastic'
Plugin 'scrooloose/nerdtree'
-Plugin 'bling/vim-airline'
-Plugin '29decibel/codeschool-vim-theme'
+Plugin 'itchyny/lightline.vim'
+Plugin 'w0ng/vim-hybrid'
+Plugin 'cocopon/lightline-hybrid.vim'
Plugin 'Shougo/neocomplcache.vim'
Plugin 'kien/ctrlp.vim'
Plugin 'rodjek/vim-puppet'
@@ -30,13 +31,11 @@ Plugin 'jistr/vim-nerdtree-tabs'
" All of your Plugins must be added before the following line
call vundle#end() " required
filetype plugin indent on " required
-" To ignore plugin indent changes, instead use:
-"filetype plugin on
-colorscheme codeschool
-
-" Airline
-set laststatus=2
+" Hybrid color scheme
+let g:hybrid_use_Xresources = 1
+set background=dark
+colorscheme hybrid
" Tabs and indents
set tabstop=4
@@ -60,3 +59,51 @@ let g:neocomplcache_enable_at_startup = 1
" Set filetypes
au BufRead,BufNewFile *.md set filetype=markdown
au BufRead,BufNewFile *.go set filetype=go
+
+" Lightline
+set laststatus=2
+let g:lightline = {
+ \ 'colorscheme': 'hybrid',
+ \ 'active': {
+ \ 'left': [ [ 'mode', 'paste' ],
+ \ [ 'fugitive', 'readonly', 'filename', 'modified' ] ]
+ \ },
+ \ 'component_function': {
+ \ 'fugitive': 'LightLineFugitive',
+ \ 'readonly': 'LightLineReadonly',
+ \ 'modified': 'LightLineModified',
+ \ 'filename': 'LightLineFilename'
+ \ },
+ \ 'separator': { 'left': '', 'right': '' },
+ \ 'subseparator': { 'left': '>', 'right': '<' }
+ \ }
+
+function! LightLineModified()
+ if &filetype == "help"
+ return ""
+ elseif &modified
+ return "+"
+ elseif &modifiable
+ return ""
+ else
+ return ""
+ endif
+endfunction
+
+function! LightLineReadonly()
+ if &filetype == "help"
+ return ""
+ elseif &readonly
+ return "!"
+ else
+ return ""
+ endif
+endfunction
+
+function! LightLineFugitive()
+ if exists("*fugitive#head")
+ let _ = fugitive#head()
+ return strlen(_) ? 'git:'._ : ''
+ endif
+ return ''
+endfunction