diff --git a/NERDTreeBookmarks b/NERDTreeBookmarks
index d80baf5..47d430a 100644
--- a/NERDTreeBookmarks
+++ b/NERDTreeBookmarks
@@ -1,10 +1,10 @@
 dl ~/Downloads
 dotfiles ~/dotfiles
 Downloads ~/Downloads
-dropbox ~/Dropbox
 root ~/
 tm ~/Documents/workspace_tm
 
+dropbox ~/Dropbox
 active ~/Documents/workspace_active
 archive ~/Documents/workspace_archive
 private ~/Documents/workspace_private
diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..4ea4697
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,47 @@
+# setting defualt editor
+set -U EDITOR vim
+
+# setting PATH for rbenv
+set PATH /usr/local/var/rbenv/shims $PATH
+# status --is-interactive; and source (rbenv init -|psub)
+
+# setting elixir sepcific stuff
+set ERL_AFLAGS "-kernel shell_history enabled"
+
+# disable homebrew phoning home
+set HOMEBREW_NO_ANALYTICS 1
+
+# disable 'spring' for Rails development
+set DISABLE_SPRING 1
+
+# setting ulimits
+# ulimit -Hn 2048
+# ulimit -Sn 2048
+
+# set abbveriations
+if status --is-interactive
+    set -g fish_user_abbreviations
+    abbr --add wtm 'cd ~/Documents/workspace_tm'
+    abbr --add gst 'git status'
+    abbr --add gst 'git status'
+    abbr --add gst 'git status'
+    abbr --add gst 'git status'
+    abbr --add gst 'git status'
+    abbr --add ga 'git add .'
+    abbr --add gl 'git pull'
+    abbr --add gup 'git fetch && git rebase'
+    abbr --add gp 'git push'
+    abbr --add gc 'git commit -v'
+    abbr --add gca 'git commit -v -a'
+    abbr --add gco 'git checkout'
+    abbr --add gb 'git branch'
+    abbr --add gba 'git branch -a'
+    abbr --add gcount 'git shortlog -sn'
+    abbr --add gcp 'git cherry-pick'
+    abbr --add glg 'git log --stat --max-count=5'
+    abbr --add bb 'brew update; and brew outdated'
+    abbr --add bx 'bundle exec'
+end
+
+# disable login greeting
+set fish_greeting ''
diff --git a/fish/fishd.8c8590a2db5b b/fish/fishd.8c8590a2db5b
new file mode 100644
index 0000000..d05df90
--- /dev/null
+++ b/fish/fishd.8c8590a2db5b
@@ -0,0 +1,35 @@
+# This file is automatically generated by the fish.
+# Do NOT edit it directly, your changes will be overwritten.
+SET EDITOR:vim
+SET __fish_classic_git_prompt_initialized:\x1d
+SET __fish_init_2_39_8:\x1d
+SET __fish_init_2_3_0:\x1d
+SET fish_color_autosuggestion:8e908c
+SET fish_color_cancel:\x2dr
+SET fish_color_command:8959a8
+SET fish_color_comment:eab700
+SET fish_color_cwd:green
+SET fish_color_cwd_root:red
+SET fish_color_end:8959a8
+SET fish_color_error:c82829
+SET fish_color_escape:bryellow\x1e\x2d\x2dbold
+SET fish_color_history_current:\x2d\x2dbold
+SET fish_color_host:normal
+SET fish_color_match:\x2d\x2dbackground\x3dbrblue
+SET fish_color_normal:normal
+SET fish_color_operator:bryellow
+SET fish_color_param:4271ae
+SET fish_color_quote:718c00
+SET fish_color_redirection:3e999f
+SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_status:red
+SET fish_color_user:brgreen
+SET fish_color_valid_path:\x2d\x2dunderline
+SET fish_greeting:
+SET fish_key_bindings:fish_default_key_bindings
+SET fish_pager_color_completion:\x1d
+SET fish_pager_color_description:B3A06D\x1eyellow
+SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SET fish_user_abbreviations:\x1d
diff --git a/fish/functions/aliases.fish b/fish/functions/aliases.fish
new file mode 100644
index 0000000..7fcf972
--- /dev/null
+++ b/fish/functions/aliases.fish
@@ -0,0 +1,6 @@
+alias wtf='cd ~'
+
+function aliases
+
+end
+
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..c1fc86f
--- /dev/null
+++ b/fish/functions/fish_prompt.fish
@@ -0,0 +1,41 @@
+function _git_branch_name
+  echo (git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
+end
+
+function _is_git_dirty
+  echo (git status -s --ignore-submodules=dirty ^/dev/null)
+end
+
+function _rb_prompt
+  echo (rbenv version | awk '{print $1}')
+end
+
+function fish_prompt
+  set -l cyan (set_color -o cyan)
+  set -l magenta (set_color -o magenta)
+  set -l yellow (set_color -o yellow)
+  set -l red (set_color -o red)
+  set -l blue (set_color -o blue)
+  set -l normal (set_color normal)
+
+  set -l arrow "$magenta↪ $normal"
+  # set -l arrow "$red↪ $normal"
+  set -l cwd $cyan(pwd|sed "s=$HOME=~=")
+
+  set -l ruby_version $magenta(_rb_prompt)
+  set -l ruby_version "$ruby_version$normal in "
+
+
+  if [ (_git_branch_name) ]
+  set -l git_branch $red(_git_branch_name)
+  set git_info "$normal on $blue$git_branch$blue"
+
+  if [ (_is_git_dirty) ]
+    set -l dirty "$yellow ✗"
+    set git_info "$git_info$dirty"
+  end
+  end
+
+  echo -s $ruby_version $cwd $git_info $normal \n $arrow " "
+end
+
diff --git a/fish/functions/wtm.fish b/fish/functions/wtm.fish
new file mode 100644
index 0000000..9944080
--- /dev/null
+++ b/fish/functions/wtm.fish
@@ -0,0 +1,3 @@
+function wtm
+  cd ~/Documents/workspace_tm
+end
diff --git a/fish/functions/yy.fish b/fish/functions/yy.fish
new file mode 100644
index 0000000..8da19e0
--- /dev/null
+++ b/fish/functions/yy.fish
@@ -0,0 +1,4 @@
+function yy --description 'Use youtube-dl'
+  youtube-dl -f 'bestvideo[ext!=webm]+bestaudio[ext!=webm]/best[ext!=webm]' $argv
+end
+
diff --git a/make_my_dotfiles.sh b/make_my_dotfiles.sh
index 4660f1a..f7d05e9 100755
--- a/make_my_dotfiles.sh
+++ b/make_my_dotfiles.sh
@@ -3,7 +3,7 @@
 # some variables
 _zsh_file="/usr/local/bin/zsh"
 _homebrew=`which brew`
-_to_install="the_silver_searcher imagemagick mongodb postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl zsh elixir git vim --with-override-system-vi ag"
+_to_install="the_silver_searcher imagemagick mongodb postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl zsh elixir git vim --with-override-system-vi ag fish"
 
 # Generate symlinks for files
 for i in gemrc gitconfig gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc zshrc rubocop.yml spacemacs