From c4d896faf7e8c8066b491b27a070ae468232a9fd Mon Sep 17 00:00:00 2001
From: Tristaan <tristan.sneider@gmail.com>
Date: Mon, 26 Mar 2018 02:19:48 +0200
Subject: [PATCH] Updated polybar config, updated install script with new
 programs

---
 .config/polybar/config   |  1 -
 .config/ranger/bookmarks |  2 +-
 install.sh               | 22 ++++++++++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index dd3cd2f..6f20da1 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -135,7 +135,6 @@ format-unmounted = <label-unmounted>
 
 mount-0 = /
 mount-1 = /media
-mount-2 = /home
 
 label-mounted = %{F#55b7b7}%mountpoint%%{F-}: %free%
 label-unmounted = %mountpoint%
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index a311672..5f98bcf 100755
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -1 +1 @@
-':/home/tristan/Downloads/Garmin City navigator Europe NT 2017.10 [2GB IMG]/Europe part  1
+':/home/tristan
diff --git a/install.sh b/install.sh
index 5d35379..608e252 100755
--- a/install.sh
+++ b/install.sh
@@ -19,32 +19,30 @@ symlink_dotfiles() {
     [ ! -e "$dest" ] && ln -fs "${SCRIPT_DIR}/zsh-themes" "${HOME}/.oh-my-zsh/custom/themes"
 
 }
-git submodule update
 for var in "$@"
 do
     if [ $var == "-u" ] ; then
         sudo pacman -Syyu
     fi
 
-    if [ $var == "-y" ] ; then
-        sudo pacman -S wget
-        wget https://aur.archlinux.org/cgit/aur.git/snapshot/yaourt.tar.gz
-        wget https://aur.archlinux.org/cgit/aur.git/snapshot/package-query.tar.gz
-        tar -xvf package-query.tar.gz & tar -xvf yaourt.tar.gz
-        cd package-query
-        makepkg -sri
-        cd ../yaourt
+    # Install already build packages
+    if [ $var == "-t" ] ; then
+        sudo pacman -S zsh zsh-syntax-highlighting neovim i3-gaps ctags mplayer udiskie nitrogen compton dunst rofi terminus-font openssh lxappearance xsel conky firejail linux-hardened wget ttf-font-awesome
+        wget https://aur.archlinux.org/cgit/aur.git/snapshot/trizen.tar.gz
+        tar -xvf trizen.tar.gz
+        cd trizen
         makepkg -sri
         cd ..
-        rm -r package-query* yaourt*
+        rm -r trizen*
     fi
 
+    # Install packages from the AUR
     if [ $var == "-ii" ]; then
-        yaourt -S zsh zsh-syntax-highlighting i3blocks neovim i3-wm i3lock-color-git ctags alacritty-scrollback-git polybar mplayer udiskie nitrogen compton dunst megasync parcellite rofi terminus terminess-powerline-font-git ttf-font-awesome-4 openssh arc-gtk-theme lxappearance numix-circle-arc-icons-git pulsemixer xsel conky
-        symlink_dotfiles
+        trizen -S polybar megasync alacritty-scrollback-git i3lock-color-git terminess-powerline-font-git arc-gtk-theme numix-circle-arc-icons-git pulsemixer
     fi
 
     if [ $var == "-l" ]; then
+        git submodule init && git submodule update
         symlink_dotfiles
 
     fi