From 5a4aedd693ad217c11eeaea2a924dbe7baebf432 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Sun, 19 Jul 2015 22:12:28 -0600
Subject: [PATCH] Updating README, neovim symlinks, etc.

---
 README.md   | 22 ++++++++++++----------
 spacemacs   |  3 +--
 symlinks.sh |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ad0c523..f37e489 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,22 @@
 # Dotfiles
 
-I primarily use OS X and [NixOS](http://nixos.org/).
+I primarily use OS X and [NixOS](http://nixos.org/) GNU/Linux.
 
-After like 15 years with Vim, I've recently switched to Emacs (via [Spacemacs](https://github.com/syl20bnr/spacemacs)).
+After ~15 years with Vim, I've recently switched to Emacs, via [Spacemacs](https://github.com/syl20bnr/spacemacs).
 
-## To speed up the switch, I've decided to Emacs all the things
+## To speed up the switch, I've decided to Emacs All The Things
 - Email: [offlineimap](http://offlineimap.org/) & [mu](https://github.com/djcb/mu) & [mu4e](http://www.djcbsoftware.nl/code/mu/mu4e.html)
 - Terminal: [multiterm](http://www.emacswiki.org/emacs/MultiTerm) (although I'm having some issues)
 - Shell: [EShell](http://www.gnu.org/software/emacs/manual/html_mono/eshell.html) (only for quick tasks, for now)
 - Browser: [eww](http://www.emacswiki.org/emacs/eww) (for quick one-off searches)
+- Window Manager: [Eyebrowse](https://github.com/wasamasa/eyebrowse)
 - IRC: [ERC](http://www.emacswiki.org/emacs/ERC)
-- Notes & TODO & bookmarks, etc.: [Org mode](http://orgmode.org/)
+- Notes & TODO & bookmarks & spreadsheets & etc.: [Org mode](http://orgmode.org/)
 
-## Outside of Emacs
-- Terminal Multiplexer: [tmux](http://tmux.sourceforge.net/)
+## When not using Emacs
+- Terminal Multiplexer: [tmux](http://tmux.sourceforge.net/) & [tpm](https://github.com/tmux-plugins/tpm)
 - Shell: [zsh](http://www.zsh.org) & [Antigen](https://github.com/zsh-users/antigen) (I try [Fish](http://fishshell.com) every few months but it never sticks)
+- Editor: [Neovim](http://neovim.io/) & [vim-plug](https://github.com/junegunn/vim-plug) & 3 million plugins
 - Browser: [Firefox](https://www.mozilla.org/en-US/firefox/)
 - Window Manager (Linux): [i3](https://i3wm.org/)
 - Window Manager (OS X): [Slate](https://github.com/jigish/slate)
@@ -22,14 +24,14 @@ After like 15 years with Vim, I've recently switched to Emacs (via [Spacemacs](h
 - Terminal Emulator (OS X): [iTerm 2](http://www.iterm2.com)
 - Launcher (Linux): [dmenu](http://tools.suckless.org/dmenu/)
 - Launcher (OS X): [Alfred](http://www.alfredapp.com)
-- Journal: [jrnl](http://maebert.github.io/jrnl/) (Although considering Org mode for this)
+- IRC: [Weechat](https://weechat.org/)
+- Journal: [jrnl](http://maebert.github.io/jrnl/)
 
 ## TODO
 - Switch from Gmail to [Fastmail](http://www.fastmail.com)
 - Switch to NixOS full time
-- Switch from Dropbox to... I don't know yet. BitTorrent Sync?
-- Get my spreadsheets off of Google docs. Also not sure what to switch to for these...
+- Switch from Dropbox to... I don't know. BitTorrent Sync?
 - [vdirsyncer](https://github.com/untitaker/vdirsyncer) to sync CardDAV and CalDAV (to be hosted on Fastmail)
   - Calendar: [khal](https://github.com/geier/khal) (Or maybe something in Emacs)
   - Contacts: [khard](https://github.com/scheibler/khard)
-- Music: [mpd](http://www.musicpd.org/) or [Mopidy](https://www.mopidy.com/) & [ncmpcpp](http://ncmpcpp.rybczak.net/) (Or Emacs's mpc. I'm currently using Spotify)
+- Music: [mpd](http://www.musicpd.org/) or [Mopidy](https://www.mopidy.com/) & [ncmpcpp](http://ncmpcpp.rybczak.net/) (Or [Mingus](https://github.com/pft/mingus) in Emacs)
diff --git a/spacemacs b/spacemacs
index 5f6c3cd..b51bd0c 100644
--- a/spacemacs
+++ b/spacemacs
@@ -32,7 +32,6 @@
                                      restclient
                                      evil-snipe
                                      mu4e
-                                     dustin
                                      eyebrowse
                                      search-engine
                                      erc
@@ -40,7 +39,7 @@
                                      emacs-lisp
                                      slime
                                      (shell :variables shell-default-shell 'eshell shell-default-term-shell "/bin/bash")
-                                     emoji 
+                                     emoji
                                      syntax-checking)
 
  ;; A list of packages and/or extensions that will not be install and loaded.
diff --git a/symlinks.sh b/symlinks.sh
index 5c17d69..57d6afe 100644
--- a/symlinks.sh
+++ b/symlinks.sh
@@ -7,6 +7,7 @@ rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
 rm ~/.ruby-version; ln -s ~/dotfiles/ruby-version ~/.ruby-version
 rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
+rm -rf ~/.nvim; mkdir ~/.nvim; ln -s ~/dotfiles/vimrc ~/.nvim/nvimrc
 rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim
 rm -rf ~/.config/khal; mkdir -p ~/.config/khal; ln -s ~/dotfiles/khal.conf ~/.config/khal/khal.conf
 rm -rf ~/.vdirsyncer; mkdir ~/.vdirsyncer; ln -s ~/dotfiles/vdirsyncer/config ~/.vdirsyncer/config