diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim index cfd3b2d..0ee36b2 160000 --- a/vim/bundle/Vundle.vim +++ b/vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933 +Subproject commit 0ee36b26e127cda512a8f2852a59e5a5f374c87f diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add index 7ddc6ca..e93bc3c 100644 --- a/vim/spell/en.utf-8.add +++ b/vim/spell/en.utf-8.add @@ -13,3 +13,57 @@ ctx playlist API Junos +signage +stylesheet +CSS +SCSS +ClojureScript +app +dev +env +Figwheel +REPL +cljs +clj +interop +homebrew +OSX +readline +Clojure +CLI +cljsbuild +PhantomJS +IndexedDB +config +Heroku +uberjar +buildpack +Gemfile +Github +namespace +func +fn +idx +arg +img +inline +Facebook +viewership +MLB +Gamification +gamification +timestamp +enqueuing +renderable +perf +playlist's +namespaced +middleware +TODO +app's +db +apps +schemas +multimethod +defmethod +devcards diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl index 74b2db6..494e3c5 100644 Binary files a/vim/spell/en.utf-8.add.spl and b/vim/spell/en.utf-8.add.spl differ diff --git a/vimrc b/vimrc index 3050598..e0b3411 100644 --- a/vimrc +++ b/vimrc @@ -11,10 +11,8 @@ filetype off set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() -" Plugins go here -" -" Let Vundle manage itself -Plugin 'gmarik/Vundle.vim' +" Let Vundle manage itself. +Plugin 'VundleVim/Vundle.vim' Plugin 'mattn/webapi-vim' " Required by gist-vim Plugin 'mattn/gist-vim' @@ -42,10 +40,6 @@ Plugin 'guns/vim-clojure-highlight' Plugin 'guns/vim-clojure-static' Plugin 'tpope/vim-fireplace' - -" Plugins -Plugin 'jpalardy/vim-slime' - " All of your Plugins must be added before the following line call vundle#end() @@ -149,9 +143,9 @@ imap map bb :!bundle install map gs :Gstatus map gw :!git add . && git commit -m 'WIP' -map pn :sp ~/jelly/documents/Notes/stack.txt -map sn :sp ~/jelly/documents/software-notes/clojure.md -map rn :sp ~/work/dive-networks/files/notes/refactoring-notes.md +map pn :sp ~/.personal-files/brain/writing/stack.txt +map sn :sp ~/.personal-files/documents/software-notes/clojure.md +map rn :sp ~/.personal-files/work/dive-networks/files/notes/refactoring-notes.md """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -168,7 +162,8 @@ au Syntax * RainbowParenthesesLoadBraces " COLORS """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" colorscheme pencil -set background=light +" default to dark, can also use 'light' +set background=dark let g:airline_theme = 'pencil' " Switch between light and dark @@ -230,10 +225,10 @@ nmap z nmap ev :vsp $MYVIMRC nmap rv :so $MYVIMRC -" remap saving and quiting :P +" remap saving and quiting nmap w :w nmap q :q -nmap Q :q! +nmap qq :q! nmap x :x :ca Wa wa :ca WA wa @@ -267,6 +262,7 @@ map o :set number! number? " Spell checking map d :exec &spell==&spell? "se spell! spelllang=en_us" : "se spell!" +map = z= " Clear the search buffer (highlighting) when hitting return function! MapCR() @@ -446,9 +442,9 @@ let g:gist_post_private = 1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " VIM-CLOJURE-STATIC """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:clojure_align_multiline_strings = 1 " Default let g:clojure_fuzzy_indent = 1 + let g:clojure_align_multiline_strings = 1 let g:clojure_fuzzy_indent_patterns = ['^match', '^with', '^def', '^let'] let g:clojure_fuzzy_indent_blacklist = ['-fn$', '\v^with-%(meta|out-str|loading-context)$']