From 85134e5f4de633e1bdd00c3e74077a22305465bd Mon Sep 17 00:00:00 2001
From: Chun Li <chunli.developer@gmail.com>
Date: Wed, 5 Dec 2018 23:26:44 -0500
Subject: [PATCH] Switching back to zsh.

---
 config/fish/config.fish        | 31 -------------------------------
 config/fish/fishd.6c4008c0f732 | 31 -------------------------------
 config/nvim/init.vim           |  1 -
 install.sh                     |  2 +-
 profile                        |  3 ++-
 vimrc                          |  1 -
 zshrc                          |  3 +++
 7 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 config/fish/config.fish
 delete mode 100644 config/fish/fishd.6c4008c0f732
 delete mode 120000 config/nvim/init.vim
 create mode 100644 zshrc

diff --git a/config/fish/config.fish b/config/fish/config.fish
deleted file mode 100644
index 0edaffb..0000000
--- a/config/fish/config.fish
+++ /dev/null
@@ -1,31 +0,0 @@
-# Fish git prompt
-set __fish_git_prompt_showdirtystate 'yes'
-set __fish_git_prompt_color_branch yellow
-# Status Chars
-set __fish_git_prompt_char_dirtystate '✗'
-
-function fish_prompt
-    set last_status $status
-
-    set_color blue
-    printf '%s ' (date "+%H:%M:%S")
-
-    set_color cyan
-    printf '%s' (prompt_pwd)
-
-    set_color normal
-    printf '%s ' (__fish_git_prompt)
-
-    if test $last_status -eq 0
-        set_color green
-    else
-        set_color red
-    end
-    printf '➤ '
-
-    set_color normal
-end
-
-# no startup message
-function fish_greeting
-end
diff --git a/config/fish/fishd.6c4008c0f732 b/config/fish/fishd.6c4008c0f732
deleted file mode 100644
index 93eb0b8..0000000
--- a/config/fish/fishd.6c4008c0f732
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file is automatically generated by the fish.
-# Do NOT edit it directly, your changes will be overwritten.
-SET __fish_init_2_39_8:\x1d
-SET __fish_init_2_3_0:\x1d
-SET fish_color_autosuggestion:555\x1ebrblack
-SET fish_color_cancel:\x2dr
-SET fish_color_command:\x2d\x2dbold
-SET fish_color_comment:red
-SET fish_color_cwd:green
-SET fish_color_cwd_root:red
-SET fish_color_end:brmagenta
-SET fish_color_error:brred
-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:cyan
-SET fish_color_quote:yellow
-SET fish_color_redirection:brblue
-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_user:brgreen
-SET fish_color_valid_path:\x2d\x2dunderline
-SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell
-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
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
deleted file mode 120000
index 90f52f0..0000000
--- a/config/nvim/init.vim
+++ /dev/null
@@ -1 +0,0 @@
-../../vimrc
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 14c3308..ea34702 100755
--- a/install.sh
+++ b/install.sh
@@ -2,10 +2,10 @@
 
 DOTFILES=$(pwd)
 
-ln -s $DOTFILES/config ~/.config
 ln -si $DOTFILES/agignore ~/.agignore
 ln -si $DOTFILES/gitconfig ~/.gitconfig
 ln -si $DOTFILES/profile ~/.profile
 ln -si $DOTFILES/tmux.conf ~/.tmux.conf
 ln -si $DOTFILES/vimrc ~/.vimrc
 ln -si $DOTFILES/vimrc.bundles ~/.vimrc.bundles
+ln -si $DOTFILES/zshrc ~/.zshrc
diff --git a/profile b/profile
index 621c2f5..e5f3bb9 100644
--- a/profile
+++ b/profile
@@ -1,3 +1,4 @@
 [ -n "$PROFILE" ] && return || readonly PROFILE=1
 
-export PATH="$HOME/.cargo/bin:$PATH"
+# for haskell
+export PATH="$HOME/Library/Python/2.7/bin:$PATH"
diff --git a/vimrc b/vimrc
index b5691f9..7e30785 100644
--- a/vimrc
+++ b/vimrc
@@ -100,7 +100,6 @@ cnoremap w!! %!sudo tee > /dev/null %
 autocmd BufRead,BufNewFile *.fdoc set filetype=yaml
 " md is markdown
 autocmd BufRead,BufNewFile *.md set filetype=markdown
-autocmd BufRead,BufNewFile *.md set spell
 autocmd FileType javascript setlocal expandtab shiftwidth=2 softtabstop=2
 autocmd FileType html setlocal expandtab shiftwidth=2 softtabstop=2
 autocmd FileType css setlocal expandtab shiftwidth=2 softtabstop=2
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..0e7a523
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,3 @@
+[[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile
+
+