Move to nvim

dotfiles/config/nvim/bundle/Vundle.vim

@@ -0,0 +1 @@
+Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45

dotfiles/config/nvim/init.vim

@@ -0,0 +1,165 @@
+set fileencoding=utf-8
+
+filetype off
+
+call plug#begin('~/.nvim/plugged')
+
+" Solarized theme
+Plug 'altercation/vim-colors-solarized'
+
+" Syntastic
+Plug 'scrooloose/syntastic'
+
+" Git
+Plug 'tpope/vim-fugitive'
+
+" Easy Commenting
+Plug 'tpope/vim-commentary'
+
+" Surround - Easy changing of quotes and stuff
+Plug 'tpope/vim-surround'
+
+" Ctrlp full path fuzzy file finder
+Plug 'kien/ctrlp.vim'
+
+" Ack from vim
+Plug 'mileszs/ack.vim'
+
+" Improved vim status bar
+Plug 'bling/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+
+" Indent guides
+Plug 'Yggdroot/indentLine'
+
+" Language specific syntax highlighting
+Plug 'derekwyatt/vim-scala'
+Plug 'kchmck/vim-coffee-script'
+Plug 'rust-lang/rust.vim'
+Plug 'klen/python-mode'
+
+if !has("win32") || !has("win16")
+  "Code Completion
+  " Post-update hook for YCM
+  " Make sure to sudo pip install neovim before running this
+  function! BuildYCM(info)
+    if a:info.status == 'installed' || a:info.force
+      !./install.sh
+    endif
+  endfunction
+  Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
+
+  " Tree explorer
+  "Instead of forcing vim to start Nerdtree just do it manually
+  " autocmd vimenter * NERDTree  " make NERDTree come up automatically
+  " on vim start
+
+  Plug 'scrooloose/nerdtree'
+
+
+  " Make Vim play nice with tmux
+  " Use <c-h> <c-j> <c-k> <c-l>
+  " to move between window panes in tmux or vim
+  Plug 'christoomey/vim-tmux-navigator'
+endif
+
+" Markdown
+Plug 'godlygeek/tabular'
+Plug 'plasticboy/vim-markdown'
+
+" Jade - Express templating
+Plug 'digitaltoad/vim-jade'
+
+" Stylus highlighting
+Plug 'wavded/vim-stylus'
+
+" Haskell
+Plug 'raichoo/haskell-vim'
+
+" end plugin list
+call plug#end()
+
+
+" Solarized Dark
+set background=dark
+colorscheme solarized
+" let g:solarized_termcolors=256 " Better terminal colors
+
+" Toggle solarized scheme
+" call togglebg#map("<F5>")
+
+" Standard variables
+set expandtab                  " tabs to spaces
+set tabstop=2                  " spaces entered when tab key is pressed
+set shiftwidth=2               " spaces entered for indentation
+set number                     " Line numbering
+set clipboard=unnamedplus      " Share system clipboard
+set eol                        " End of line at bottom of file
+set shiftround
+set list
+set list listchars=tab:»·,trail:·
+
+" custom functons
+function! NumberToggle()
+  if(&relativenumber == 1)
+    set norelativenumber
+    set number
+  else
+    set relativenumber
+  endif
+endfunc
+
+" Autocmds
+
+" Stripping trailing whitespace on save
+autocmd BufWritePre * :%s/\s\+$//e
+
+" Fix rust
+autocmd FileType rust setlocal shiftwidth=2 tabstop=2
+autocmd BufRead,BufNewFile *.rs set filetype=rust
+
+" Disable the rust style guide recommended 4 space indentation
+let g:rust_recommended_style=0
+
+" Hotkeys
+" Note noremap is a normal mode non-recursive mapping
+" nnoremap and nmap make the bind only work in normal mode
+
+let mapleader=" "
+map <silent> <Leader>t :NERDTreeToggle<CR>
+nnoremap <silent> <Leader>r :call NumberToggle()<CR>
+
+" This one maps F5 to delete all trailing whitespace
+nnoremap <silent> <F5> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR>
+
+" Pressing enter in command mode clears the current search highlighting until
+" the next search.
+nnoremap <silent> <CR> :noh<CR><CR>
+
+" ctrlp hotkeys
+let g:ctrlp_map='<c-p>'
+let g:ctrlp_cmd='CtrlP'
+
+" ctrlp configuration
+set wildignore+=*/tmp/*,*.so,*.swp,*.zip      " MacOSX/Linux
+set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe   " Windows
+
+let g:ctrlp_working_path_mode='ra'
+
+" Highlight any line with ErrorMsg that goes over 120 characters
+if exists('+colorcolumn')
+  set colorcolumn=120
+else
+  au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1)
+endif
+
+" Indent lines customizations
+
+" Color customizations
+" let g:indentLine_color_term=###
+
+" Line indent guides are defaulted to off
+let g:indentLine_enabled=0
+
+" Leader + i will toggle line indent guides
+map <silent> <Leader>i :IndentLinesToggle<CR>

dotfiles/emacs.d/init.el

@@ -330,6 +330,13 @@ setq org-log-done t)
 (show-paren-mode 1)
 
 ;;--------------------------------------------------------------------------------------
+;; JSX Mode
+;;--------------------------------------------------------------------------------------
+
+(add-to-list 'auto-mode-alist '("\\.jsx\\'" . jsx-mode))
+(autoload 'jsx-mode "jsx-mode" "JSX mode" t)
+
+;;--------------------------------------------------------------------------------------
 ;; Ivy Configuration
 ;;--------------------------------------------------------------------------------------
 
@@ -494,6 +501,12 @@ setq org-log-done t)
     (self-insert-command N)))
 
 ;;-------------------------------------------------------------------------------------
+;; JS Mode 2 Space Indenting
+;;-------------------------------------------------------------------------------------
+
+(setq js-indent-level 2)
+
+;;-------------------------------------------------------------------------------------
 ;; Key Bindings
 ;;-------------------------------------------------------------------------------------
 

dotfiles/emacs.d/package.el

@@ -6,7 +6,7 @@
                          flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper sass-mode linum-relative
                          js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline toml-mode
                          projectile rust-mode color-theme-solarized wrap-region stylus-mode rainbow-delimiters
-                         livescript-mode jade-mode)
+                         livescript-mode jade-mode jsx-mode)
   "Packages to make sure are installed")
 
 (defun my-packages-installed-p ()

dotfiles/zshrc

@@ -2,7 +2,7 @@
 export ZSH=~/.oh-my-zsh
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
-export VISUAL="emacs -nw"
+export VISUAL="nvim"
 export EDITOR="$VISUAL"
 export ITERM_24BIT=1
 export TERM=rxvt-256color