forrestfiller · November 17, 2016 21:06 · Mar 4, 2016 · Mar 4, 2016 · Mar 4, 2016 · Feb 25, 2016
diff --git a/install.sh b/install.sh
@@ -0,0 +1,3 @@
+curl -o .bash_prompt https://gist.github.com/mimiflynn/9144157/raw/53ba4e96b9b1e344f676dccf7d07a3f6f74cc117/.bash_prompt
+curl -o .bash_profile https://gist.github.com/mimiflynn/9144157/raw/b48cf53c35984114c94f1c9c6fa4887e82b46582/.bash_profile
+source .bash_profile
diff --git a/.bash_profile b/.bash_profile
@@ -20,11 +20,6 @@ if [ -f ~/.bash_path ]; then
   source ~/.bash_path
 fi
 
-# Load in .bashrc
-if [ -f ~/.bashrc ]; then
-  source ~/.bashrc
-fi
-
 # Load prompt
 if [ -f ~/.bash_prompt ]; then
     source ~/.bash_prompt

diff --git a/.bash_profile b/.bash_profile
@@ -1,5 +1,3 @@
-export PATH=/usr/local/bin:/usr/local/share/npm/bin:/usr/local/opt/ruby/bin:/Applications/MAMP/bin:/Applications/MAMP/Library/bin:/Applications/MAMP/bin/php/php5.3.6/bin:/Users/mimiflynn/bin:$PATH
-
 # pip should only run in when virtualenv is currently activated
 export PIP_REQUIRE_VIRTUALENV=true
 
@@ -13,18 +11,16 @@ alias show='defaults write com.apple.finder AppleShowAllFiles TRUE && killall Fi
 alias hide='defaults write com.apple.finder AppleShowAllFiles FALSE && killall Finder'
 
 alias ls='ls -G'
-
-alias gpull='git pull origin master'
-alias gpush='git push origin master'
+alias ll='ls -al'
 
 alias nodewebkit='zip -r ../${PWD##*/}.nw *'
 
 # Path ------------------------------------------------------------
-if [ -d ~/.local/bin ]; then
-  export PATH=~/.local/bin:$PATH
+if [ -f ~/.bash_path ]; then
+  source ~/.bash_path
 fi
 
-# Load in .bashrc -------------------------------------------------
+# Load in .bashrc
 if [ -f ~/.bashrc ]; then
   source ~/.bashrc
 fi
@@ -33,3 +29,8 @@ fi
 if [ -f ~/.bash_prompt ]; then
     source ~/.bash_prompt
 fi
+
+# Load alias'
+if [ -f ~/.bash_alias ]; then
+    source ~/.bash_alias
+fi
diff --git a/bash_prompt → .bash_prompt b/bash_prompt → .bash_prompt
@@ -21,4 +21,4 @@ BLUE_BG="\[\033[0;44m\]"
 
 # Prompt
 # export PS1="$LIGHT_BLUE[$CYAN\h$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
-export PS1="$LIGHT_BLUE[$CYAN\h$LIGHT_BLUE] [$LIGHT_RED\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\d \@$LIGHT_BLUE] $NO_COLOUR\$ "
+export PS1="$LIGHT_BLUE[$CYAN\u@\h$LIGHT_BLUE] [$LIGHT_RED\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\d \@$LIGHT_BLUE] $NO_COLOUR\$ "
diff --git a/.vimrc.local b/.vimrc.local
@@ -1,67 +0,0 @@
-" Bonus Bundles
-Bundle 'git://git.wincent.com/command-t.git'
-
-" Keyboard Shortcuts
-
-let mapleader = '\'
-
-" Let's us save with \w.
-" \ is the default leader key.
-map <leader>w :w!<cr>
-
-" Fast editing of the .vimrc.local
-map <leader>e :tabedit! ~/.vimrc.local<CR>
-
-" Clear trailing whitespace with \s and save the file.
-map <leader>s :%s/\s\+$//e<CR>:w!<CR>
-
-" Open files quickly with \o.
-map <leader>o :tabedit<Space>
-
-map <leader>t :CommandT<CR>
-
-" Open a custom Commad-T instace with \T
-map <leader>T :CommandT<Space>~/Sites
-
-" Open files verticall quickly with \v.
-map <leader>v :vsplit<Space>
-
-" Better tab functionality.
-map <leader>[ :tabprev<CR>
-map <leader>] :tabnext<CR>
-map <leader>- :tabfirst<CR>
-map <leader>= :tablast<CR>
-
-" Toggle paste mode with \p
-set pastetoggle=<leader>p
-
-" Toggle line numbers with \n
-nmap <leader>n :set invnumber<CR>
-
-map <space> /
-map <c-space> ?
-
-" Other Customization
-
-set wrap
-set linebreak
-set nolist
-
-set mouse=a
-
-colorscheme ir_black
-
-" When vimrc is edited, reload it
-autocmd! bufwritepost .vimrc.local source ~/.vimrc.local
-
-" Column at line 80
-if version >= 703
-  set colorcolumn=81,82
-endif
-
-"highlight bg color of current line
-hi cursorline ctermbg=black
-hi colorcolumn ctermbg=234
-
-let g:CommandTAcceptSelectionMap = '<C-t>'
-let g:CommandTAcceptSelectionTabMap = '<CR>'

diff --git a/dotfiles.md b/dotfiles.md
@@ -1,21 +0,0 @@
-`.bash_profile` fun times
-
-## virtualenv quick activate bash function
-
-```bash
-# set virtual env with 'venv <env name>'
-# instead of directory/structure/<env name>/bin/
-venv() {
-  # directory where the virtualenvs live
-  VENVDIR="$HOME/Virtualenvs"
-
-  ENVDIR=$VENVDIR/$1
-
-  if [ -d "$ENVDIR" ]; then
-    . "$ENVDIR"/bin/activate
-  fi
-  if [ ! -d "$ENVDIR" ]; then
-    echo "There is no virtual environment called" $1 "in" $VENVDIR
-  fi
-}
-```

diff --git a/gvimrc.local b/gvimrc.local
@@ -1,20 +0,0 @@
-" quick edit for gvimrc
-map <leader>g :tabedit ~/.gvimrc.local<CR>
-
-" When gvimrc is edited, reload it
-autocmd! bufwritepost .gvimrc.local source ~/.gvimrc.local
-
-" Appearance
-set lines=50
-set columns=100
-set guifont=Monaco:h12
-set guioptions-=T
-set transparency=5
-colorscheme cobaltish
-
-" highlight current line
-set cursorline
-
-"highlight bg color of current line
-hi cursorline guibg=#7F3700
-hi colorcolumn guibg=#020236

diff --git a/vimrc.local b/vimrc.local
@@ -1,79 +0,0 @@
-" Bonus Bundles
-
-Bundle 'git://git.wincent.com/command-t.git'
-
-" Tab settings
-set tabstop=2
-set softtabstop=2
-set shiftwidth=2
-set smarttab
-set expandtab
-
-" Keyboard Shortcuts
-
-let mapleader = '\'
-
-" Let's us save with \w.
-" \ is the default leader key.
-map <leader>w :w!<cr>
-
-" Fast editing of the .vimrc.local
-map <leader>e :tabedit! ~/.vimrc.local<CR>
-
-" Clear trailing whitespace with \s and save the file.
-map <leader>s :%s/\s\+$//e<CR>:w!<CR>
-
-" Fix indentation and return to current line
-map <leader>i mzgg=G`z<CR>
-
-" Open files quickly with \o.
-map <leader>o :tabedit<Space>
-
-map <leader>t :CommandT<CR>
-
-" Open a custom Commad-T instace with \T
-map <leader>T :CommandT<Space>~/Sites
-
-" Open files verticall quickly with \v.
-map <leader>v :vsplit<Space>
-
-" Better tab functionality.
-map <leader>[ :tabprev<CR>
-map <leader>] :tabnext<CR>
-map <leader>- :tabfirst<CR>
-map <leader>= :tablast<CR>
-
-" Toggle paste mode with \p
-set pastetoggle=<leader>p
-
-" Toggle line numbers with \n
-nmap <leader>n :set invnumber<CR>
-
-map <space> /
-map <c-space> ?
-
-
-" Other Customization
-
-set wrap
-set linebreak
-set nolist
-
-set mouse=a
-
-colorscheme ir_black
-
-" When vimrc is edited, reload it
-autocmd! bufwritepost .vimrc.local source ~/.vimrc.local
-
-" Column at line 80
-if version >= 703
-  set colorcolumn=81,82
-endif
-
-"highlight bg color of current line
-hi cursorline ctermbg=black
-hi colorcolumn ctermbg=234
-
-let g:CommandTAcceptSelectionMap = '<C-t>'
-let g:CommandTAcceptSelectionTabMap = '<CR>'

diff --git a/.vimrc.local b/.vimrc.local
@@ -0,0 +1,67 @@
+" Bonus Bundles
+Bundle 'git://git.wincent.com/command-t.git'
+
+" Keyboard Shortcuts
+
+let mapleader = '\'
+
+" Let's us save with \w.
+" \ is the default leader key.
+map <leader>w :w!<cr>
+
+" Fast editing of the .vimrc.local
+map <leader>e :tabedit! ~/.vimrc.local<CR>
+
+" Clear trailing whitespace with \s and save the file.
+map <leader>s :%s/\s\+$//e<CR>:w!<CR>
+
+" Open files quickly with \o.
+map <leader>o :tabedit<Space>
+
+map <leader>t :CommandT<CR>
+
+" Open a custom Commad-T instace with \T
+map <leader>T :CommandT<Space>~/Sites
+
+" Open files verticall quickly with \v.
+map <leader>v :vsplit<Space>
+
+" Better tab functionality.
+map <leader>[ :tabprev<CR>
+map <leader>] :tabnext<CR>
+map <leader>- :tabfirst<CR>
+map <leader>= :tablast<CR>
+
+" Toggle paste mode with \p
+set pastetoggle=<leader>p
+
+" Toggle line numbers with \n
+nmap <leader>n :set invnumber<CR>
+
+map <space> /
+map <c-space> ?
+
+" Other Customization
+
+set wrap
+set linebreak
+set nolist
+
+set mouse=a
+
+colorscheme ir_black
+
+" When vimrc is edited, reload it
+autocmd! bufwritepost .vimrc.local source ~/.vimrc.local
+
+" Column at line 80
+if version >= 703
+  set colorcolumn=81,82
+endif
+
+"highlight bg color of current line
+hi cursorline ctermbg=black
+hi colorcolumn ctermbg=234
+
+let g:CommandTAcceptSelectionMap = '<C-t>'
+let g:CommandTAcceptSelectionTabMap = '<CR>'
diff --git a/.bash_profile b/.bash_profile
@@ -0,0 +1,35 @@
+export PATH=/usr/local/bin:/usr/local/share/npm/bin:/usr/local/opt/ruby/bin:/Applications/MAMP/bin:/Applications/MAMP/Library/bin:/Applications/MAMP/bin/php/php5.3.6/bin:/Users/mimiflynn/bin:$PATH
+
+# pip should only run in when virtualenv is currently activated
+export PIP_REQUIRE_VIRTUALENV=true
+
+# cache pip-installed packages to avoid re-downloading
+export PIP_DOWNLOAD_CACHE=$HOME/.pip/cache
+
+alias profile='vim ~/.bash_profile'
+alias rehash='source ~/.bash_profile'
+
+alias show='defaults write com.apple.finder AppleShowAllFiles TRUE && killall Finder'
+alias hide='defaults write com.apple.finder AppleShowAllFiles FALSE && killall Finder'
+
+alias ls='ls -G'
+
+alias gpull='git pull origin master'
+alias gpush='git push origin master'
+
+alias nodewebkit='zip -r ../${PWD##*/}.nw *'
+
+# Path ------------------------------------------------------------
+if [ -d ~/.local/bin ]; then
+  export PATH=~/.local/bin:$PATH
+fi
+
+# Load in .bashrc -------------------------------------------------
+if [ -f ~/.bashrc ]; then
+  source ~/.bashrc
+fi
+
+# Load prompt
+if [ -f ~/.bash_prompt ]; then
+    source ~/.bash_prompt
+fi
diff --git a/bash_prompt b/bash_prompt
@@ -0,0 +1,24 @@
+# Colors
+TEMP="\[\033[1;30m\]"
+BLACK="\[\033[0;30m\]"
+RED="\[\033[0;31m\]"
+GREEN="\[\033[0;32m\]"
+ORANGE="\[\033[0;33m\]"
+BLUE="\[\033[0;34m\]"
+PURPLE="\[\033[0;35m\]"
+CYAN="\[\033[0;36m\]"
+LIGHT_GRAY="\[\033[0;37m\]"
+LIGHT_BLACK="\[\033[1;30m\]"
+LIGHT_RED="\[\033[1;31m\]"
+LIGHT_GREEN="\[\033[1;32m\]"
+YELLOW="\[\033[1;33m\]"
+LIGHT_BLUE="\[\033[1;34m\]"
+LIGHT_PINK="\[\033[1;35m\]"
+LIGHT_CYAN="\[\033[1;36m\]"
+WHITE="\[\033[1;37m\]"
+NO_COLOUR="\[\033[0m\]"
+BLUE_BG="\[\033[0;44m\]"
+
+# Prompt
+# export PS1="$LIGHT_BLUE[$CYAN\h$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
+export PS1="$LIGHT_BLUE[$CYAN\h$LIGHT_BLUE] [$LIGHT_RED\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\d \@$LIGHT_BLUE] $NO_COLOUR\$ "
diff --git a/dotfiles.md b/dotfiles.md
@@ -19,31 +19,3 @@ venv() {
   fi
 }
 ```
-
-## Awesome prompt
-
-```bash
-# Colors
-TEMP="\[\033[1;30m\]"
-BLACK="\[\033[0;30m\]"
-RED="\[\033[0;31m\]"
-GREEN="\[\033[0;32m\]"
-ORANGE="\[\033[0;33m\]"
-BLUE="\[\033[0;34m\]"
-PURPLE="\[\033[0;35m\]"
-CYAN="\[\033[0;36m\]"
-LIGHT_GRAY="\[\033[0;37m\]"
-LIGHT_BLACK="\[\033[1;30m\]"
-LIGHT_RED="\[\033[1;31m\]"
-LIGHT_GREEN="\[\033[1;32m\]"
-YELLOW="\[\033[1;33m\]"
-LIGHT_BLUE="\[\033[1;34m\]"
-LIGHT_PINK="\[\033[1;35m\]"
-LIGHT_CYAN="\[\033[1;36m\]"
-WHITE="\[\033[1;37m\]"
-NO_COLOUR="\[\033[0m\]"
-BLUE_BG="\[\033[0;44m\]"
-
-# Prompt
-export PS1="$LIGHT_GRAY[$CYAN\u$LIGHT_GRAY] [$LIGHT_RED\w$LIGHT_GRAY]\n$LIGHT_GRAY[$WHITE\@$LIGHT_GRAY]$NO_COLOUR \$ "
-```
diff --git a/dotfiles.md b/dotfiles.md
@@ -1,4 +1,4 @@
-# `.bash_profile` fun times
+`.bash_profile` fun times
 
 ## virtualenv quick activate bash function
 

diff --git a/dotfiles.md b/dotfiles.md
@@ -1,3 +1,5 @@
+# `.bash_profile` fun times
+
 ## virtualenv quick activate bash function
 
 ```bash

diff --git a/gvimrc.local b/gvimrc.local
@@ -0,0 +1,20 @@
+" quick edit for gvimrc
+map <leader>g :tabedit ~/.gvimrc.local<CR>
+
+" When gvimrc is edited, reload it
+autocmd! bufwritepost .gvimrc.local source ~/.gvimrc.local
+
+" Appearance
+set lines=50
+set columns=100
+set guifont=Monaco:h12
+set guioptions-=T
+set transparency=5
+colorscheme cobaltish
+
+" highlight current line
+set cursorline
+
+"highlight bg color of current line
+hi cursorline guibg=#7F3700
+hi colorcolumn guibg=#020236
diff --git a/vimrc.local b/vimrc.local
@@ -1,4 +1,3 @@
-
 " Bonus Bundles
 
 Bundle 'git://git.wincent.com/command-t.git'

diff --git a/vimrc.local b/vimrc.local
@@ -0,0 +1,80 @@
+
+" Bonus Bundles
+
+Bundle 'git://git.wincent.com/command-t.git'
+
+" Tab settings
+set tabstop=2
+set softtabstop=2
+set shiftwidth=2
+set smarttab
+set expandtab
+
+" Keyboard Shortcuts
+
+let mapleader = '\'
+
+" Let's us save with \w.
+" \ is the default leader key.
+map <leader>w :w!<cr>
+
+" Fast editing of the .vimrc.local
+map <leader>e :tabedit! ~/.vimrc.local<CR>
+
+" Clear trailing whitespace with \s and save the file.
+map <leader>s :%s/\s\+$//e<CR>:w!<CR>
+
+" Fix indentation and return to current line
+map <leader>i mzgg=G`z<CR>
+
+" Open files quickly with \o.
+map <leader>o :tabedit<Space>
+
+map <leader>t :CommandT<CR>
+
+" Open a custom Commad-T instace with \T
+map <leader>T :CommandT<Space>~/Sites
+
+" Open files verticall quickly with \v.
+map <leader>v :vsplit<Space>
+
+" Better tab functionality.
+map <leader>[ :tabprev<CR>
+map <leader>] :tabnext<CR>
+map <leader>- :tabfirst<CR>
+map <leader>= :tablast<CR>
+
+" Toggle paste mode with \p
+set pastetoggle=<leader>p
+
+" Toggle line numbers with \n
+nmap <leader>n :set invnumber<CR>
+
+map <space> /
+map <c-space> ?
+
+
+" Other Customization
+
+set wrap
+set linebreak
+set nolist
+
+set mouse=a
+
+colorscheme ir_black
+
+" When vimrc is edited, reload it
+autocmd! bufwritepost .vimrc.local source ~/.vimrc.local
+
+" Column at line 80
+if version >= 703
+  set colorcolumn=81,82
+endif
+
+"highlight bg color of current line
+hi cursorline ctermbg=black
+hi colorcolumn ctermbg=234
+
+let g:CommandTAcceptSelectionMap = '<C-t>'
+let g:CommandTAcceptSelectionTabMap = '<CR>'
diff --git a/dotfiles.md b/dotfiles.md
@@ -43,5 +43,5 @@ NO_COLOUR="\[\033[0m\]"
 BLUE_BG="\[\033[0;44m\]"
 
 # Prompt
-export PS1="$LIGHT_BLUE[$CYAN\u$LIGHT_BLUE] [$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
+export PS1="$LIGHT_GRAY[$CYAN\u$LIGHT_GRAY] [$LIGHT_RED\w$LIGHT_GRAY]\n$LIGHT_GRAY[$WHITE\@$LIGHT_GRAY]$NO_COLOUR \$ "
 ```
diff --git a/dotfiles.md b/dotfiles.md
@@ -43,5 +43,5 @@ NO_COLOUR="\[\033[0m\]"
 BLUE_BG="\[\033[0;44m\]"
 
 # Prompt
-export PS1="$LIGHT_BLUE[$CYAN\u$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
+export PS1="$LIGHT_BLUE[$CYAN\u$LIGHT_BLUE] [$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
 ```
diff --git a/dotfiles.md b/dotfiles.md
@@ -43,5 +43,5 @@ NO_COLOUR="\[\033[0m\]"
 BLUE_BG="\[\033[0;44m\]"
 
 # Prompt
-export PS1="$LIGHT_BLUE[$CYAN\h$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
+export PS1="$LIGHT_BLUE[$CYAN\u$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
 ```
diff --git a/dotfiles.md b/dotfiles.md
@@ -43,5 +43,5 @@ NO_COLOUR="\[\033[0m\]"
 BLUE_BG="\[\033[0;44m\]"
 
 # Prompt
-export PS1="$LIGHT_BLUE[$LIGHT_GREEN\h$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
+export PS1="$LIGHT_BLUE[$CYAN\h$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
 ```
diff --git a/dotfiles.md b/dotfiles.md
@@ -16,4 +16,32 @@ venv() {
     echo "There is no virtual environment called" $1 "in" $VENVDIR
   fi
 }
+```
+
+## Awesome prompt
+
+```bash
+# Colors
+TEMP="\[\033[1;30m\]"
+BLACK="\[\033[0;30m\]"
+RED="\[\033[0;31m\]"
+GREEN="\[\033[0;32m\]"
+ORANGE="\[\033[0;33m\]"
+BLUE="\[\033[0;34m\]"
+PURPLE="\[\033[0;35m\]"
+CYAN="\[\033[0;36m\]"
+LIGHT_GRAY="\[\033[0;37m\]"
+LIGHT_BLACK="\[\033[1;30m\]"
+LIGHT_RED="\[\033[1;31m\]"
+LIGHT_GREEN="\[\033[1;32m\]"
+YELLOW="\[\033[1;33m\]"
+LIGHT_BLUE="\[\033[1;34m\]"
+LIGHT_PINK="\[\033[1;35m\]"
+LIGHT_CYAN="\[\033[1;36m\]"
+WHITE="\[\033[1;37m\]"
+NO_COLOUR="\[\033[0m\]"
+BLUE_BG="\[\033[0;44m\]"
+
+# Prompt
+export PS1="$LIGHT_BLUE[$LIGHT_GREEN\h$LIGHT_BLUE][$WHITE\w$LIGHT_BLUE]\n$LIGHT_BLUE[$WHITE\t$LIGHT_BLUE]$NO_COLOUR\$ "
 ```
diff --git a/dotfiles.md b/dotfiles.md
@@ -0,0 +1,19 @@
+## virtualenv quick activate bash function
+
+```bash
+# set virtual env with 'venv <env name>'
+# instead of directory/structure/<env name>/bin/
+venv() {
+  # directory where the virtualenvs live
+  VENVDIR="$HOME/Virtualenvs"
+
+  ENVDIR=$VENVDIR/$1
+
+  if [ -d "$ENVDIR" ]; then
+    . "$ENVDIR"/bin/activate
+  fi
+  if [ ! -d "$ENVDIR" ]; then
+    echo "There is no virtual environment called" $1 "in" $VENVDIR
+  fi
+}
+```
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		" Bonus Bundles

		Bundle 'git://git.wincent.com/command-t.git'