From 316a7a662bd4e5f489ce77544205375b0977599b Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Thu, 29 Oct 2015 20:25:36 -0500
Subject: [PATCH] update location of neovim config, update link.sh

* move ~/.nvim to ~/.config/nvim
* move ~/.nvimrc to ~/.config/nvim/init.vim
* update install/link.sh to skip already existing files
* update install/link.sh to handle creating symlinks for files in newly created config/ directory

These changes are consistent with the latest neovim install, which moves away from ~/.nvim and ~/.nvimrc
---
 .gitignore                                    | 10 ++++---
 .../nvim}/autoload/plug.vim                   |  0
 nvim/nvimrc.symlink => config/nvim/init.vim   |  2 +-
 .../nvim}/snippets/_.snippets                 |  0
 .../nvim}/snippets/gitcommit.snippets         |  0
 .../nvim}/snippets/html.snippets              |  0
 .../nvim}/snippets/javascript.snippets        |  0
 .../nvim}/snippets/markdown.snippets          |  0
 .../nvim}/snippets/textile.snippets           |  0
 .../nvim}/snippets/typescript.snippets        |  0
 .../nvim}/snippets/vim.snippets               |  0
 install/link.sh                               | 28 +++++++++++++++++--
 12 files changed, 32 insertions(+), 8 deletions(-)
 rename {nvim/nvim.symlink => config/nvim}/autoload/plug.vim (100%)
 rename nvim/nvimrc.symlink => config/nvim/init.vim (99%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/_.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/gitcommit.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/html.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/javascript.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/markdown.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/textile.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/typescript.snippets (100%)
 rename {nvim/nvim.symlink => config/nvim}/snippets/vim.snippets (100%)

diff --git a/.gitignore b/.gitignore
index 07cd4d1..f4fb4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 .netrwhist
 npm-debug.log
-vim/vim.symlink/plugged/
-nvim/nvim.symlink/plugged/
+
 plug.vim.old
+
+config/nvim/spell
+config/nvim/shada
+config/nvim/plugged
 vim/vim.symlink/spell/
-nvim/nvim.symlink/spell/
-nvim/nvim.symlink/shada/
+vim/vim.symlink/plugged/
diff --git a/nvim/nvim.symlink/autoload/plug.vim b/config/nvim/autoload/plug.vim
similarity index 100%
rename from nvim/nvim.symlink/autoload/plug.vim
rename to config/nvim/autoload/plug.vim
diff --git a/nvim/nvimrc.symlink b/config/nvim/init.vim
similarity index 99%
rename from nvim/nvimrc.symlink
rename to config/nvim/init.vim
index 0c1ab4c..f54f882 100644
--- a/nvim/nvimrc.symlink
+++ b/config/nvim/init.vim
@@ -1,4 +1,4 @@
-call plug#begin('~/.nvim/plugged')
+call plug#begin('~/.config/nvim/plugged')
 
 " colorschemes
 Plug 'chriskempson/base16-vim'
diff --git a/nvim/nvim.symlink/snippets/_.snippets b/config/nvim/snippets/_.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/_.snippets
rename to config/nvim/snippets/_.snippets
diff --git a/nvim/nvim.symlink/snippets/gitcommit.snippets b/config/nvim/snippets/gitcommit.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/gitcommit.snippets
rename to config/nvim/snippets/gitcommit.snippets
diff --git a/nvim/nvim.symlink/snippets/html.snippets b/config/nvim/snippets/html.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/html.snippets
rename to config/nvim/snippets/html.snippets
diff --git a/nvim/nvim.symlink/snippets/javascript.snippets b/config/nvim/snippets/javascript.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/javascript.snippets
rename to config/nvim/snippets/javascript.snippets
diff --git a/nvim/nvim.symlink/snippets/markdown.snippets b/config/nvim/snippets/markdown.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/markdown.snippets
rename to config/nvim/snippets/markdown.snippets
diff --git a/nvim/nvim.symlink/snippets/textile.snippets b/config/nvim/snippets/textile.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/textile.snippets
rename to config/nvim/snippets/textile.snippets
diff --git a/nvim/nvim.symlink/snippets/typescript.snippets b/config/nvim/snippets/typescript.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/typescript.snippets
rename to config/nvim/snippets/typescript.snippets
diff --git a/nvim/nvim.symlink/snippets/vim.snippets b/config/nvim/snippets/vim.snippets
similarity index 100%
rename from nvim/nvim.symlink/snippets/vim.snippets
rename to config/nvim/snippets/vim.snippets
diff --git a/install/link.sh b/install/link.sh
index ab4b11b..ae98ada 100755
--- a/install/link.sh
+++ b/install/link.sh
@@ -2,10 +2,32 @@
 
 DOTFILES=$HOME/.dotfiles
 
-echo "creating symlinks"
+echo -e "\nCreating symlinks"
+echo "=============================="
 linkables=$( find -H "$DOTFILES" -maxdepth 3 -name '*.symlink' )
 for file in $linkables ; do
     target="$HOME/.$( basename $file ".symlink" )"
-    echo "creating symlink for $file"
-    ln -s $file $target
+    if [ -e $target ]; then
+        echo "~${target#$HOME} already exists... Skipping."
+    else
+        echo "Creating symlink for $file"
+        ln -s $file $target
+    fi
+done
+
+echo -e "\n\ninstalling to ~/.config"
+echo "=============================="
+if [ ! -d $HOME/.config ]; then
+    echo "Creating ~/.config"
+    mkdir -p $HOME/.config
+fi
+# configs=$( find -path "$DOTFILES/config.symlink" -maxdepth 1 )
+for config in $DOTFILES/config/*; do
+    target=$HOME/.config/$( basename $config )
+    if [ -e $target ]; then
+        echo "~${target#$HOME} already exists... Skipping."
+    else
+        echo "Creating symlink for $config"
+        ln -s $config $target
+    fi
 done