Update configs based on usage

.bash_profile

@@ -7,8 +7,6 @@ source ~/bash/colors.sh
 source ~/bash/extras.sh
 source ~/bash/prompt.sh
 
-source ~/.local
-
 shopt -s cdspell
 shopt -s checkwinsize
 shopt -s histappend

.gitconfig

@@ -16,10 +16,13 @@
 	autocorrect = 1
 [merge]
 	keepBackup = false
+	tool = code
+	conflictstyle = diff3
 [push]
 	default = simple
 [filter "media"]
 	clean = git-media-clean %f
 	smudge = git-media-smudge %f
 [include]
-	path = ~/.git.user.config
+	path = ~/.git.user.config
+	path = ~/.gitconfig.local

.gitignore

@@ -3,7 +3,6 @@
 *.swp
 .subversion
 
-
 # Folder view configuration files
 .DS_Store
 Desktop.ini
@@ -40,42 +39,50 @@ fish/fishd.*
 
 # Misc
 .CFUserTextEncoding
-.rbenv
 .docker
+.localized
+*.padl
+.rbenv
+*.ssb
 .viminfo
+.yarnrc
+.zcompdump
 
 # User directories in MacOS
-<<<<<<< Updated upstream
 Applications
-Code
+
 Desktop
 Documents
 Downloads
 Library
 Movies
 Music
 Pictures
-Public
+Sites
 SpiderOak Hive
+code/
 .aws/
-.babel.json
+.bundle/
+.cargo/
 .config/
 .docker/
 .electron/
+.gem/
 .histfile
 .luna/
+.multirust/
 .node-gyp/
 .now/
 .npm/
+.opam/
 .pia_manager/
-.*.log
 .pm2/
+.rustup/
 .vscode/
-.yarnrc
-.zcompdump
+.vscode-insiders/
 
-# Private keys
+# Sensitive data
 .local
-.git.user.config
 .ssh
-
+.gitconfig.local
+.*.log

.zshrc

@@ -21,3 +21,7 @@ zstyle :compinstall filename '$HOME/.zshrc'
 autoload -Uz compinit
 compinit
 # End of lines added by compinstall
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

Brewfile

@@ -25,9 +25,9 @@ cask "moom"
 cask "torbrowser"
 
 # Can't add until signed into MAS
-mas "GIPHY Capture", id: 668208984
-mas "bear", id: 1091189122
-mas "keynote", id: 409183694
-mas "pages", id: 409201541
-mas "ia-writer", id: 775737590
-mas "kindle", id: 405399194
+# mas "GIPHY Capture", id: 668208984
+# mas "bear", id: 1091189122
+# mas "keynote", id: 409183694
+# mas "pages", id: 409201541
+# mas "ia-writer", id: 775737590
+# mas "kindle", id: 405399194

README.md

@@ -1,8 +1,9 @@
 # ~/.dotfiles
 
-
 ## Overview
+
 An opinionated attempt for a cross-shell setup.
 
 ## Contributing
+
 Pull requests are very welcome. Fork away!

fish/abbreviations.fish

@@ -25,11 +25,19 @@ abbr -a hhf defaults write com.apple.finder AppleShowAllFiles -bool false
 
 # Easier navigation: Thanks @mathiasbynens, @gf3, et al.
 abbr -a .. cd ..
+<<<<<<< HEAD
 abbr -a cdc cd ~/Code/
 abbr -a cdd cd ~/Downloads
 abbr -a cddf cd ~/Code/dotfiles
 abbr -a cdl cd ~/Code/laptop
 abbr -a cds cd ~/Code/kevinsuttle.github.io
+=======
+abbr -a cdc cd ~/code/
+abbr -a cdd cd ~/Downloads
+abbr -a cddf cd ~/code/dotfiles
+abbr -a cdl cd ~/code/laptop
+abbr -a cds cd ~/code/kevinsuttle.github.io
+>>>>>>> Update configs based on usage
 
 # Application Shortcuts
 abbr -a start_server "python -m SimpleHTTPServer"

fish/config.fish

@@ -2,7 +2,7 @@ if not status --is-interactive
   exit 0
 end
 
-source "$XDG_CONFIG_HOME/fish/abbreviations.fish"
+source "$HOME/fish/abbreviations.fish"
 
 # Fishhh
 set -x fish_greeting ""
@@ -15,10 +15,7 @@ set -x MANPAGER "less -X"
 
 set -x GIT_TERMINAL_PROMPT 1
 set -x GOPATH $HOME/go
-set -x DOTFILES $HOME/Code/dotfiles
-set -x DOCKER_HOST tcp://(boot2docker ip):2376
-set -x DOCKER_CERT_PATH /Users/(whoami)/.boot2docker/certs/boot2docker-vm
-set -x DOCKER_TLS_VERIFY 1
+set -x DOTFILES $HOME/code/dotfiles
 
 # Path
 if not set -q -U fish_user_paths

setup.sh

@@ -1,19 +1,19 @@
 #! env sh
 
-if ( brew --version ) < /dev/null > /dev/null 2>&1; then 
-    echo 'Homebrew is already installed!' 
+if ( brew --version ) < /dev/null > /dev/null 2>&1; then
+    echo 'Homebrew is already installed!'
 else
-    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; 
+    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)";
 fi
 
-if ( brew cask --version; ) < /dev/null > /dev/null 2>&1; then 
-    echo 'Caskroom tapped already' 
+if ( brew cask --version; ) < /dev/null > /dev/null 2>&1; then
+    echo 'Caskroom tapped already'
 else
     brew tap caskroom/cask;
 fi
 
-if ( brew bundle check; ) < /dev/null > /dev/null 2>&1; then 
-    echo 'Brewfiles enabled' 
+if ( brew bundle check; ) < /dev/null > /dev/null 2>&1; then
+    echo 'Brewfiles enabled'
 else
     brew tap Homebrew/bundle;
     brew bundle;
@@ -23,18 +23,20 @@ brew cleanup;
 brew prune;
 brew doctor;
 
-cd ~; 
-git init; 
+cd ~;
+git init;
 git clone https://github.com/kevinSuttle/dotfiles.git .;
 git checkout -t origin/master
 git remote add origin https://github.com/kevinSuttle/dotfiles.git;
 git fetch origin;
-mkdir -p ~/Code && cd $_;
+mkdir -p ~/code && cd $_;
 
 # 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;
+
+nvm install --lts;
+npm install --global pure-prompt;

zsh/extras.zsh

@@ -1,4 +1,4 @@
 test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_integration.zsh
 
 # brew info zsh-syntax-highlighting
-source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+test -e /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh && source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh