From 0c82cf2d43883292baf18a49cbe4bf319796316e Mon Sep 17 00:00:00 2001
From: Kevin <kevin@Kevins-MacBook-Air.local>
Date: Tue, 26 Dec 2017 15:58:29 -0500
Subject: [PATCH] Update order and config for new machine

---
 .bash_profile | 17 +++++++++++++++++
 .gitignore    | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 env           | 14 --------------
 extras        |  5 ++++-
 setup.sh      |  5 +++--
 5 files changed, 76 insertions(+), 18 deletions(-)
 create mode 100755 .bash_profile
 delete mode 100644 env
 mode change 100644 => 100755 extras

diff --git a/.bash_profile b/.bash_profile
new file mode 100755
index 0000000..5414974
--- /dev/null
+++ b/.bash_profile
@@ -0,0 +1,17 @@
+source ~/env
+source ~/aliases
+source ~/colors
+source ~/extras
+source ~/prompt
+
+source ~/bash/colors.sh
+source ~/bash/extras.sh
+source ~/bash/prompt.sh
+
+shopt -s cdspell
+shopt -s checkwinsize
+shopt -s histappend
+shopt -s nocaseglob
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 174621d..93374dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,53 @@
-npm-debug.log
+.svn
+*~
+*.swp
+.subversion
+.ssh
+
+# Folder view configuration files
 .DS_Store
+Desktop.ini
+
+# Thumbnail cache files
+._*
+Thumbs.db
+
+# Files that might appear on external disks
+.Spotlight-V100
+.Trashes
+.Trash
+
+# NPM
+npm-debug.log
+node_modules
+bower_components
+
+# IDEs
+.idea
+.nvm
+
+# Fish
+fish/fish_history
+fish/fishd.*
+
+# Bash
+.bash_history
+
+# Misc
+.CFUserTextEncoding
+.bash_sessions
+
+.rbenv
+.nvm
+.viminfo
+
+Applications
+Code
+Desktop
+Documents
+Downloads
+Library
+Movies
+Music
+Pictures
+Public
\ No newline at end of file
diff --git a/env b/env
deleted file mode 100644
index bf1fa1a..0000000
--- a/env
+++ /dev/null
@@ -1,14 +0,0 @@
-export EDITOR=vim
-
-export NVM_DIR="$HOME/.nvm"
-  . "/usr/local/opt/nvm/nvm.sh"
-
-export HOMEBREW_CASK_OPTS="--appdir=~/Applications"
-
-if which ruby >/dev/null && which gem >/dev/null; then
-    PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
-fi
-
-export AWS_ACCESS_KEY="AKIAI7JFD3Q56EMCQAVA"
-export AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY"
-export AWS_SECRET_ACCESS_KEY="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"
\ No newline at end of file
diff --git a/extras b/extras
old mode 100644
new mode 100755
index da96029..e316d2e
--- a/extras
+++ b/extras
@@ -1,4 +1,7 @@
-[ -f ~.travis/travis.sh ] && source ~.travis/travis.sh
+export EDITOR=vim
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 
 if which ruby >/dev/null && which gem >/dev/null; then
     PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
diff --git a/setup.sh b/setup.sh
index 0186941..1560574 100644
--- a/setup.sh
+++ b/setup.sh
@@ -31,9 +31,10 @@ git remote add origin https://github.com/kevinSuttle/dotfiles.git;
 git fetch origin;
 mkdir -p ~/Code && cd $_;
 
-git clone https://github.com/kevinSuttle/macOS-Defaults.git macOS-defaults -b suttle && cd $_;
-source .osx;
+# git clone https://github.com/kevinSuttle/macOS-Defaults.git macOS-defaults -b suttle && cd $_;
+# source .osx;
 
 rbenv install 2.4.3;
 mkdir -p ~/.nvm;
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash;
 nvm install --lts;
\ No newline at end of file