Clean up home folder aliases, prompt, zsh config

.gitignore

@@ -2,7 +2,7 @@
 *~
 *.swp
 .subversion
-.ssh
+
 
 # Folder view configuration files
 .DS_Store
@@ -17,31 +17,35 @@ Thumbs.db
 .Trashes
 .Trash
 
-# NPM
-npm-debug.log
+# Npm
+*.log
 node_modules
 bower_components
+.nvm
+.npm
+.pm2
+.node-gyp
+.babel.json
 
 # IDEs
 .idea
-.nvm
 
 # Fish
 fish/fish_history
 fish/fishd.*
 
 # Bash
 .bash_history
+.bash_sessions
 
 # Misc
 .CFUserTextEncoding
-.bash_sessions
-
 .rbenv
-.nvm
+.docker
 .viminfo
 
 # User directories in MacOS
+<<<<<<< Updated upstream
 Applications
 Code
 Desktop
@@ -73,3 +77,5 @@ SpiderOak Hive
 # Private keys
 .local
 .git.user.config
+.ssh
+

.zshrc

@@ -0,0 +1,23 @@
+source $HOME/aliases
+source $HOME/colors
+source $HOME/extras
+source $HOME/prompt
+
+source $HOME/zsh/colors.zsh
+source $HOME/zsh/extras.zsh
+source $HOME/zsh/prompt.zsh
+
+# Lines configured by zsh-newuser-install
+HISTFILE=~/.histfile
+HISTSIZE=10000
+SAVEHIST=10000
+setopt appendhistory autocd extendedglob nomatch notify
+unsetopt beep
+bindkey -e
+# End of lines configured by zsh-newuser-install
+# The following lines were added by compinstall
+zstyle :compinstall filename '$HOME/.zshrc'
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall

aliases

@@ -16,7 +16,7 @@ alias glo="git log --decorate --oneline --graph"
 alias glg="git log --decorate --graph --abbrev-commit --date=relative"
 alias gmg='git merge --no-ff'
 alias gph="git push"
-alias gpr="git pull"
+alias gpr="git pull --verbose"
 alias gpom="git push origin master"
 alias grao="git remote add origin"
 alias grau="git remote add upstream"

prompt

@@ -20,8 +20,8 @@ PROMPT_STATUS_ERROR_BACKGROUND='red'
 
 # PROMPT_GIT_ICON="⋋ "
 PROMPT_GIT_ICON=""
-PROMPT_OUTGOING_CHANGES_ICON="\U21E1"  # ↥ ⊷ ↗ \U234F
-PROMPT_INCOMING_CHANGES_ICON="\U21E3"  # ↧ ⊶ ↙ \U2356 ⎌
+PROMPT_OUTGOING_CHANGES_ICON="⇡"  # ↥ ⊷ ↗ ⍏
+PROMPT_INCOMING_CHANGES_ICON="⇣"  # ↧ ⊶ ↙ ⍖ ⎌
 PROMPT_TAG_ICON="\UF092 "
 PROMPT_COMMIT_ICON="\UF03C "
 PROMPT_BOOKMARK_ICON="\U1F516 "

zshrc

@@ -1,25 +1,8 @@
-source $XDG_CONFIG_HOME/local
-source $XDG_CONFIG_HOME/env
-
-source $XDG_CONFIG_HOME/aliases
-source $XDG_CONFIG_HOME/colors
-source $XDG_CONFIG_HOME/extras
-source $XDG_CONFIG_HOME/prompt
-
-source $XDG_CONFIG_HOME/zsh/colors.zsh
-source $XDG_CONFIG_HOME/zsh/extras.zsh
-source $XDG_CONFIG_HOME/zsh/prompt.zsh
-
-HISTFILE=~/.histfile
-HISTSIZE=100
-SAVEHIST=100000
-setopt appendhistory autocd extendedglob
-unsetopt beep
-bindkey -v
-
-# zsh autocomplete
-zstyle :compinstall filename '~/.zshrc'
-zstyle ':completion:*' rehash true
-
-autoload -Uz compinit
-compinit
+source $HOME/aliases
+source $HOME/colors
+source $HOME/extras
+source $HOME/prompt
+
+source $HOME/zsh/colors.zsh
+source $HOME/zsh/extras.zsh
+source $HOME/zsh/prompt.zsh