nvim config

bash_profile

@@ -29,16 +29,21 @@ export tmux="$HOME/.dot_files/tmux/tmux.conf"
 # Aliases go here: 
 alias ls='ls -GFh'
 alias ll='ls -la'
+alias gcd='cd $(git rev-parse --show-toplevel)'
 
 alias pi3="ssh [email protected]"
+alias pi="ssh [email protected]"
 alias godaddy="ssh [email protected]"
+alias dali="ssh [email protected]"
+alias sudi='ssh [email protected]'
+
 # Python aliases
 alias 3='python3'
-alias 2='python'
 
 # tmux
 alias tmux="tmux -2"
 alias tls="tmux ls"
+alias tkill="tmux kill-server"
 alias ta="tmux attach"
 TERM=xterm-256color
 
@@ -47,13 +52,9 @@ alias idea='. idea'
 alias prompt='. prompt'
 alias dt='. dt'
 
-alias pi="ssh [email protected]"
-
 # sql server
 alias sql='sudo /usr/local/mysql/bin/mysql -u root'
 
-alias sudi='ssh [email protected]'
-
 # code helpers
 # alias server="python -m SimpleHTTPServer"
 alias mygcc="gcc -Wall -pedantic -std=c11"
@@ -80,11 +81,6 @@ PATH=$PATH:~/bin
 # SQL
 PATH=$PATH:/usr/local/mysql/bin
 
-# Setting PATH for Python 2.7
-PATH="/Library/Frameworks/Python.framework/Versions/2.7/bin:${PATH}"
-
-# Setting PATH for Python 3.4
-PATH="/Library/Frameworks/Python.framework/Versions/3.4/bin:${PATH}"
 
 PATH="/usr/local/bin:${PATH}"
 
@@ -111,5 +107,12 @@ fi
 # Go installs packages here
 export GOPATH="/Users/sidneywijngaarde/go/"
 
-# added by Anaconda3 4.2.0 installer
-export PATH="/Users/sidneywijngaarde/anaconda3/bin:$PATH"
+# added by Anaconda3 4.3.0 installer
+export PATH="/Users/sidneywijngaarde/anaconda/bin:$PATH"
+
+# tabtab source for serverless package
+# uninstall by removing these lines or running `tabtab uninstall serverless`
+[ -f /Users/sidneywijngaarde/.config/yarn/global/node_modules/tabtab/.completions/serverless.bash ] && . /Users/sidneywijngaarde/.config/yarn/global/node_modules/tabtab/.completions/serverless.bash
+# tabtab source for sls package
+# uninstall by removing these lines or running `tabtab uninstall sls`
+[ -f /Users/sidneywijngaarde/.config/yarn/global/node_modules/tabtab/.completions/sls.bash ] && . /Users/sidneywijngaarde/.config/yarn/global/node_modules/tabtab/.completions/sls.bash

bin/server

@@ -1,3 +1,3 @@
 port="${1:-8000}"
 open "https://localhost:${port}/"
-/usr/local/bin/python -m SimpleHTTPServer "$port"
+python2.7 -m SimpleHTTPServer "$port"

cheatsheets/git_cheatsheet

@@ -49,3 +49,32 @@ git commit --amend
 
  git commit --amend --no-edit
  - Ammend and don't change the commit message
+
+git stash
+ - Saves changes that aren't ready for a commit
+
+git stash list
+ - Show all stashes
+
+git stash pop <|stash>
+ - Reapply stashed changes - this deletes the stash
+ - No arg just uses the last stash
+
+git stash apply
+ - Applies the stashed changes but doesn't delete them
+ - Useful for applying to multiple branches
+
+git stash save <message>
+ - Puts the message on the commit for more context
+
+git stash show
+ - View stash diff
+
+git stash branch <branch_name> <stash>
+ - Create a new branch from the stash
+
+git stash drop <stash>
+ - Delete the stash
+
+git stash clear
+ - Delete all

install.sh

@@ -8,7 +8,7 @@ echo "Dot files folder: $dir"
 ln -s $dir/tmux/tmux.conf $HOME/.tmux.conf
 ln -s $dir/vim/vimrc $HOME/.vimrc
 ln -s $dir/vim $HOME/.vim
-ln -s $dir/vim $HOME/.config/nvim
+ln -s $dir/nvim $HOME/.config/nvim
 ln -s $dir/vim/vimrc $HOME/.config/nvim/init.vim
 ln -s $dir/bash_profile $HOME/.bash_profile
 ln -s $dir/gitconfig $HOME/.gitconfig