From 509ba812d3388aaafdc5c24fc7ee517336af6d79 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sat, 27 Jul 2019 11:21:58 +0200
Subject: [PATCH] Zsh is back, bitch.

---
 install.sh    | 53 ++++++++++++++++++++++++++++++++++-----------------
 legacy/zsh.sh | 20 -------------------
 2 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 legacy/zsh.sh

diff --git a/install.sh b/install.sh
index f2e1bc1..94657e7 100644
--- a/install.sh
+++ b/install.sh
@@ -30,21 +30,40 @@ rm -rf ~/.tmux.conf
 # installing
 ln -sf ~/.dotfiles/tmux.conf ~/.tmux.conf
 
-## fish
+## zsh
 # cleaning
-rm -rf ~/.config/fish ~/.local/share/fish ~/.config/omf ~/.local/share/omf
-# installing omf
-curl -L https://github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > ~/install.omf
-fish ~/install.omf --noninteractive
-fish -c 'omf install bobthefish'
-rm -rf ~/install.omf
-# installing misc settings
-mkdir -p ~/.config/fish/functions
-echo 'function fish_greeting; end' > ~/.config/fish/functions/fish_greeting.fish
-echo 'function fish_right_prompt; end' > ~/.config/fish/functions/fish_right_prompt.fish
-touch ~/.fish.local
-echo 'set -x VIRTUAL_ENV_DISABLE_PROMPT 1' > ~/.config/fish/config.fish
-echo 'set -g theme_title_use_abbreviated_path no' >> ~/.config/fish/config.fish
-echo 'set -g fish_prompt_pwd_dir_length 0' >> ~/.config/fish/config.fish
-echo 'set -g theme_display_user yes' >> ~/.config/fish/config.fish
-echo 'source ~/.fish.local' >> ~/.config/fish/config.fish
+rm -rf ~/.zsh* ~/.oh-my-zsh
+# installing
+mkdir ~/.zsh
+git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+git clone https://github.com/zsh-users/zsh-autosuggestions.git ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
+cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+sed -i -e 's/ZSH_THEME="robbyrussell"/ZSH_THEME="agnoster"/' ~/.zshrc
+sed -i -e 's/plugins=(git)/plugins=(git zsh-autosuggestions zsh-syntax-highlighting)/' ~/.zshrc
+sed -i -e 's/# CASE_SENSITIVE/CASE_SENSITIVE/' ~/.zshrc
+if [ ! `whoami` = "root" ]; then
+  echo 'export DEFAULT_USER=$LOGNAME' >> ~/.zshrc
+fi
+echo "[ -e ~/.zshrc.local ] && source ~/.zshrc.local" >> ~/.zshrc
+touch ~/.zshrc.local
+source ~/.zshrc
+
+### fish
+## cleaning
+#rm -rf ~/.config/fish ~/.local/share/fish ~/.config/omf ~/.local/share/omf
+## installing omf
+#curl -L https://github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > ~/install.omf
+#fish ~/install.omf --noninteractive
+#fish -c 'omf install bobthefish'
+#rm -rf ~/install.omf
+## installing misc settings
+#mkdir -p ~/.config/fish/functions
+#echo 'function fish_greeting; end' > ~/.config/fish/functions/fish_greeting.fish
+#echo 'function fish_right_prompt; end' > ~/.config/fish/functions/fish_right_prompt.fish
+#touch ~/.fish.local
+#echo 'set -x VIRTUAL_ENV_DISABLE_PROMPT 1' > ~/.config/fish/config.fish
+#echo 'set -g theme_title_use_abbreviated_path no' >> ~/.config/fish/config.fish
+#echo 'set -g fish_prompt_pwd_dir_length 0' >> ~/.config/fish/config.fish
+#echo 'set -g theme_display_user yes' >> ~/.config/fish/config.fish
+#echo 'source ~/.fish.local' >> ~/.config/fish/config.fish
diff --git a/legacy/zsh.sh b/legacy/zsh.sh
deleted file mode 100644
index c3a9ca3..0000000
--- a/legacy/zsh.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# cleaning
-rm -rf ~/.zsh ~/.oh-my-zsh ~/.zshrc
-
-# zsh
-mkdir ~/.zsh
-git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
-git clone https://github.com/zsh-users/zsh-autosuggestions.git ~/.zsh/autosuggestions
-cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
-sed -i -e 's/ZSH_THEME="robbyrussell"/ZSH_THEME="agnoster"/' ~/.zshrc
-sed -i -e 's/# CASE_SENSITIVE/CASE_SENSITIVE/' ~/.zshrc
-if [ ! `whoami` = "root" ]; then
-  echo 'export DEFAULT_USER=$LOGNAME' >> ~/.zshrc
-fi
-echo "zstyle ':vcs_info:*' enable git svn" >> ~/.zshrc
-echo "[ -e ~/.zsh/autosuggestions/zsh-autosuggestions.zsh ] && source ~/.zsh/autosuggestions/zsh-autosuggestions.zsh" >> ~/.zshrc
-echo "[ -e ~/.zshrc.local ] && source ~/.zshrc.local" >> ~/.zshrc
-touch ~/.zshrc.local
-source ~/.zshrc