Better restructure, removed powerline fonts, update fzf

This commit is contained in:
JGill
2020-02-06 15:36:13 +10:30
parent 8c3292f9ec
commit 611942d4e2

View File

@@ -17,8 +17,10 @@ fi
echo -e "Installing oh-my-zsh\n" echo -e "Installing oh-my-zsh\n"
if git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh; then if [ -d .oh-my-zsh ]; then
echo -e "Installed OH-MY-ZSH\n" echo -e "oh-my-zsh is already installed"
else
git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git .oh-my-zsh
fi fi
cp -f .zshrc ~/ cp -f .zshrc ~/
@@ -26,66 +28,65 @@ cp -f .zshrc ~/
mkdir ~/.quickzsh # external plugins, things, will be instlled in here mkdir ~/.quickzsh # external plugins, things, will be instlled in here
if [ -d ~/.oh-my-zsh/plugins/zsh-autosuggestion ]; then
if git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions; then :
else
cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull
else
git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions
fi fi
if git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting; then : if [ -d ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting ]; then
else
cd ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting && git pull cd ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting && git pull
else
git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
fi fi
if git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions; then : if [ -d ~/.oh-my-zsh/custom/plugins/zsh-completions]; then
else
cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull
else
git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions
fi fi
if git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search; then : if [ -d ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search ]; then
else
cd ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search && git pull cd ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search && git pull
else
git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search
fi fi
# INSTALL FONTS # INSTALL FONTS
if git clone --depth=1 https://github.com/powerline/fonts.git --depth=1 ~/.quickzsh/powerline_fonts; then : echo -e "Installing Nerd Fonts version of Hack, Roboto Mono, DejaVu Sans Mono\n"
else
cd ~/.quickzsh/powerline_fonts && git pull
fi
if ~/.quickzsh/powerline_fonts/install.sh && rm -rf ~/.quickzsh/powerline_fonts; then
echo -e "\npowerline_fonts Installed\n"
else
echo -e "\npowerline_fonts Installation Failed\n"
fi
wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Hack/Regular/complete/Hack%20Regular%20Nerd%20Font%20Complete.ttf -P ~/.fonts/ wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Hack/Regular/complete/Hack%20Regular%20Nerd%20Font%20Complete.ttf -P ~/.fonts/
wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/RobotoMono/Regular/complete/Roboto%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/ wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/RobotoMono/Regular/complete/Roboto%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/
wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/
fc-cache -fv ~/.fonts fc-cache -fv ~/.fonts
if [ -d ~/.oh-my-zsh/custom/themes/powerlevel10k ]; then
if git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.oh-my-zsh/custom/themes/powerlevel10k; then :
else
cd ~/.oh-my-zsh/custom/themes/powerlevel10k && git pull cd ~/.oh-my-zsh/custom/themes/powerlevel10k && git pull
else
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.oh-my-zsh/custom/themes/powerlevel10k
fi fi
if git clone --depth 1 https://github.com/junegunn/fzf.git ~/.quickzsh/fzf; then : if [ -d ~/.quickzsh/fzf ]; then
else
cd ~/.quickzsh/fzf && git pull cd ~/.quickzsh/fzf && git pull
fi
~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 ~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64
if git clone --depth 1 https://github.com/supercrabtree/k $HOME/.oh-my-zsh/custom/plugins/k; then :
else else
cd ~/.oh-my-zsh/custom/plugins/k && git pull git clone --depth 1 https://github.com/junegunn/fzf.git ~/.quickzsh/fzf
~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64
fi fi
if git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker; then : if [ -d ~/.oh-my-zsh/custom/plugins/k ]; then
cd ~/.oh-my-zsh/custom/plugins/k && git pull
else else
git clone --depth 1 https://github.com/supercrabtree/k $HOME/.oh-my-zsh/custom/plugins/k; then :
fi
if [ -d ~/.quickzsh/marker ]; then
cd ~/.quickzsh/marker && git pull cd ~/.quickzsh/marker && git pull
else
git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker; then :
fi fi
if ~/.quickzsh/marker/install.py; then if ~/.quickzsh/marker/install.py; then