4 files changed, 32 insertions, 40 deletions
diff --git a/.aliases b/.aliases
index 61ffe3f..c5ea4eb 100644
--- a/.aliases
+++ b/.aliases
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 alias ls='ls --color=auto'
+alias ll='ls --color=auto -lh'
 alias diff='diff --color=auto'
 alias grep='grep --color=auto'
 
diff --git a/.zplugrc b/.zplugrc
new file mode 100755
index 0000000..ca5358a
--- /dev/null
+++ b/.zplugrc
@@ -0,0 +1,23 @@
+#!/usr/bin/env zsh
+
+export ZPLUG_HOME=$HOME/.zplug
+
+if [ ! -d $ZPLUG_HOME ]; then
+ echo 'Installing zplug ... '
+ git clone https://github.com/zplug/zplug.git $ZPLUG_HOME
+fi
+source $ZPLUG_HOME/init.zsh 
+
+zplug "plugins/git", from:oh-my-zsh
+zplug "zsh-users/zsh-completions"
+zplug "zsh-users/zsh-syntax-highlighting"
+zplug "dracula/zsh", as:theme
+
+if ! zplug check --verbose; then
+ printf "Install? [y/N]: "
+ if read -q; then
+ echo; zplug install
+ fi
+fi
+
+zplug load
diff --git a/.zshrc b/.zshrc
index 9765dd0..0bb8fd3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -20,47 +20,15 @@ HISTFILE=~/.zsh_history
 
 source $HOME/.path
 source $HOME/.env
+source $HOME/.aliases
+source $HOME/.functions
 
 [[ -r /usr/share/z/z.sh ]] && source /usr/share/z/z.sh
 [[ -r /usr/local/etc/profile.d/z.sh ]] && source /usr/local/etc/profile.d/z.sh
 
-# System Specific
-case `uname` in 
-Darwin)
- # Alias
- alias ll='ls -lhG'
- 
- source ~/.macos
-;;
-Linux)
- # commands for Linux
-;;
-FreeBSD)
- # commands for FreeBSD
-;;
-esac
-
-# zplug
-if [ ! -d ~/.zplug ]; then
- echo 'Installing zplug ... '
- git clone https://github.com/zplug/zplug.git ~/.zplug
-fi
-source ~/.zplug/init.zsh 
-zplug "plugins/git", from:oh-my-zsh
-zplug "zsh-users/zsh-completions"
-zplug "zsh-users/zsh-syntax-highlighting"
-zplug "dracula/zsh", as:theme
-if ! zplug check --verbose; then
- printf "Install? [y/N]: "
- if read -q; then
- echo; zplug install
- fi
-fi
-zplug load
-
-source $HOME/.aliases
-source $HOME/.functions
-[ -f $HOME/.zsh_local ] && source $HOME/.zsh_local
+[ -r $HOME/.zplugrc ] && source $HOME/.zplugrc
+[ -r $HOME/.nnnrc ] && source $HOME/.nnnrc
+[ -r $HOME/.fzfrc ] && source $HOME/.fzfrc
 
-[ -f $HOME/.nnnrc ] && source $HOME/.nnnrc
-[ -f $HOME/.fzfrc ] && source $HOME/.fzfrc
+[[ $(uname) == Darwin ]] && [ -r $HOME/.macos ] && source $HOME/.macos
+[ -r $HOME/.zsh_local ] && source $HOME/.zsh_local
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index dc5d3cc..842680f 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -21,7 +21,7 @@ link_all () {
 .mbsyncrc .msmtprc .tmux.conf .urlview .zshrc \
 .vimrc .vim .path .functions .emacs.d .gitconfig \
 .config/i3 .config/polybar .xinitrc .pam_environment \
- .zprofile .newsboat .ledgerrc .nnnrc .alacritty.yml .fzfrc
+ .zprofile .newsboat .ledgerrc .nnnrc .alacritty.yml .fzfrc .zplugrc
 }
 
 main () {