From 6544b3963d90a51076637a1a3aa67d5b3b575482 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Fri, 10 Jan 2020 16:11:15 +0100
Subject: [PATCH] Goodbye oh-my-zsh

---
 install.sh                      | 13 ++++++-------
 legacy/agnoster.zsh             |  4 ----
 legacy/{fish.conf => fish.init} |  0
 legacy/oh-my-zsh.init           | 12 ++++++++++++
 zsh/zshrc                       | 13 ++++++-------
 5 files changed, 24 insertions(+), 18 deletions(-)
 rename legacy/{fish.conf => fish.init} (100%)
 create mode 100644 legacy/oh-my-zsh.init

diff --git a/install.sh b/install.sh
index 36c4bc1..87a1f46 100644
--- a/install.sh
+++ b/install.sh
@@ -31,13 +31,12 @@ ln -sf ~/.dotfiles/tmux.conf ~/.tmux.conf
 
 ## zsh
 # cleaning
-rm -rf ~/.zshrc ~/.oh-my-zsh
+rm -rf ~/.zsh ~/.zshrc
+mkdir -p ~/.zsh/plugins ~/.zsh/themes
 # dependiences
-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
-git clone --recursive https://github.com/mengelbrecht/slimline.git ~/.oh-my-zsh/custom/themes/slimline
+git clone https://github.com/zsh-users/zsh-autosuggestions.git ~/.zsh/plugins/zsh-autosuggestions
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.zsh/plugins/zsh-syntax-highlighting
+git clone --recursive https://github.com/mengelbrecht/slimline.git ~/.zsh/themes/slimline
 # install
-cp ~/.dotfiles/zsh/zshrc ~/.zshrc
+ln -sf ~/.dotfiles/zsh/zshrc ~/.zshrc
 touch ~/.zshrc.local
-source ~/.zshrc
diff --git a/legacy/agnoster.zsh b/legacy/agnoster.zsh
index c28934f..b65375e 100644
--- a/legacy/agnoster.zsh
+++ b/legacy/agnoster.zsh
@@ -1,10 +1,6 @@
 git clone https://github.com/popstas/zsh-command-time.git ~/.oh-my-zsh/custom/plugins/command-time
-export ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="agnoster"
-CASE_SENSITIVE="true"
- ENABLE_CORRECTION="true"
 plugins=(git kube-ps1 command-time zsh-autosuggestions zsh-syntax-highlighting)
-source $ZSH/oh-my-zsh.sh
 export DEFAULT_USER=$LOGNAME
 source ~/.dotfiles/zsh/abbr_pwd
 prompt_dir() {
diff --git a/legacy/fish.conf b/legacy/fish.init
similarity index 100%
rename from legacy/fish.conf
rename to legacy/fish.init
diff --git a/legacy/oh-my-zsh.init b/legacy/oh-my-zsh.init
new file mode 100644
index 0000000..82d654b
--- /dev/null
+++ b/legacy/oh-my-zsh.init
@@ -0,0 +1,12 @@
+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
+export ZSH=$HOME/.oh-my-zsh
+CASE_SENSITIVE="true"
+ENABLE_CORRECTION="true"
+plugins=(git zsh-autosuggestions zsh-syntax-highlighting)
+source $ZSH/oh-my-zsh.sh
+
+#optional
+git clone --recursive https://github.com/mengelbrecht/slimline.git ~/.oh-my-zsh/custom/themes/slimline
+source ~/.oh-my-zsh/custom/themes/slimline/slimline.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
index c559b82..7a45116 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,10 +1,9 @@
-export ZSH=$HOME/.oh-my-zsh
-CASE_SENSITIVE="true"
-ENABLE_CORRECTION="true"
-plugins=(git zsh-autosuggestions zsh-syntax-highlighting)
-source $ZSH/oh-my-zsh.sh
-
-source ~/.oh-my-zsh/custom/themes/slimline/slimline.zsh
+autoload -U compinit && compinit
+alias ll='ls -lh'
+alias ls='ls -G'
+source ~/.zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+source ~/.zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ~/.zsh/themes/slimline/slimline.zsh
 SLIMLINE_USER_HOST_INFO_FORMAT="%F{green}|user|%F{white}@%F{cyan}|host|%f"
 SLIMLINE_USER_HOST_INFO_ROOT_FORMAT="%F{red}|user|%F{white}@%F{cyan}|host|%f"
 SLIMLINE_SYMBOL_WORKING_FORMAT="%F{red}➜%f"