From a6ef3edf2fbfd63f60ccfc4445d42a622cc15046 Mon Sep 17 00:00:00 2001
From: Jason Dagit <dagit@galois.com>
Date: Mon, 25 Nov 2013 13:07:22 -0800
Subject: [PATCH] Add lightline to vim

---
 .gitconfig |  2 ++
 .ssh/rc    |  8 ++++++--
 .vimrc     | 20 +++++++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 0b2a755..f2edb2f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,3 +7,5 @@
   lol = log --graph --decorate --pretty=oneline --abbrev-commit
 [github]
 	user = dagit
+[push]
+	default = simple
diff --git a/.ssh/rc b/.ssh/rc
index c0cfd87..d0b8029 100755
--- a/.ssh/rc
+++ b/.ssh/rc
@@ -1,4 +1,8 @@
 #!/bin/bash
-if test "$SSH_AUTH_SOCK" ; then
-  ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
+host=`hostname`
+if [ $host != "flux.galois.com" ]
+then
+  if test "$SSH_AUTH_SOCK" ; then
+    ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
+  fi
 fi
diff --git a/.vimrc b/.vimrc
index eba0abf..5d877d7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -22,8 +22,26 @@ Bundle 'mattn/gist-vim'
 Bundle 'altercation/vim-colors-solarized'
 Bundle 'airblade/vim-gitgutter'
 
-:let g:haddock_browser=""
+" lightline.vim config
+Bundle 'itchyny/lightline.vim'
+set laststatus=2
+let g:lightline = {
+      \ 'component': {
+      \   'readonly': '%{&readonly?"⭤":""}'
+      \ } }
+if $OS != 'windows'
+    let g:lightline['separator']    =  { 'left': '⮀', 'right': '⮂' }
+    let g:lightline['subseparator'] =  { 'left': '⮁', 'right': '⮃' }
+endif
+
+:let g:haddock_browser="open"
 
+"vim-notes config:
+:let g:notes_directories = ['~/AeroFS/Notes']
+:let g:notes_suffix = '.md'
+:let g:notes_title_sync = 'rename_file'
+:let g:notes_shadowdir = '~/AeroFS/Notes'
+:let g:notes_indexfile = '.vim-notes.idx'
 set t_Co=256
 syntax enable
 set nocompatible