cleanup and change to fish shell

Makefile

@@ -1,24 +1,16 @@
-.PHONY: all test clean vim git zsh bash nvim fish
+.PHONY: all test clean git nvim fish
 
-all: bash
-
-bash:
-	cp bash/_bashrc ~/.bashrc
-	cp bash/_primary_bashrc ~/.primary_bashrc
-	source ~/.bashrc
+all: git nvim fish
 
 git:
-	cp git/_gitconfig ~/.gitconfig
-
-vim:
-	cp vim/_vimrc ~/.vimrc
-
-zsh:
-	cp zsh/.zshrc ~/.zshrc
+	mkdir -p ~/.config/backup && mv ~/.config/git ~/.config/backup/git.$(shell date +%Y-%m-%d-%H%M%S)
+	cp -rf git ~/.config/git
 
 nvim:
-	cp nvim/init.vim ~/.config/nvim/init.vim
+	mkdir -p ~/.config/backup && mv ~/.config/nvim ~/.config/backup/nvim.$(shell date +%Y-%m-%d-%H%M%S)
+	cp -rf nvim ~/.config/nvim
 
 fish:
-	mv ~/.config/fish ~/.config/fish.$(shell date +%s)
-	cp -rf ~/dotfiles/fish ~/.config/fish
+	mkdir -p ~/.config/backup && mv ~/.config/fish ~/.config/backup/fish.$(shell date +%Y-%m-%d-%H%M%S)
+	cp -rf fish ~/.config/fish
+

README.md

@@ -7,8 +7,8 @@ make
 
 ## build individually
 ```
-make vim
-make zsh
+make nvim
+make fish
 make git
 ```
 

fish/config.fish

@@ -13,7 +13,7 @@ set -g fish_user_paths "/usr/local/opt/[email protected]/bin" $fish_user_paths
 # go
 #
 
-set -g -x GOROOT /usr/local/Cellar/go/1.9.1/libexec
+set -g -x GOROOT /usr/local/Cellar/go@1.8/1.8.4/libexec/
 set -g -x GOPATH ~/primary/go
 set -g -x PATH $PATH $GOROOT/bin # go root binaries
 set -g -x PATH $PATH ~/primary/go/bin # go path binaries

git/ignore

@@ -0,0 +1,11 @@
+# Vim
+*.swp
+
+# OSX's Desktop Services Store
+.DS_Store
+
+# Visual Studio Code
+.vscode
+
+# IDEA Plattform - IntelliJ, Goland
+.idea