From a7acd125b25602767c14818cdcf935c71438ed9f Mon Sep 17 00:00:00 2001
From: Mateja <mail@matejamaric.com>
Date: Mon, 31 May 2021 12:42:58 +0200
Subject: More choices and reordering...

---
 setup.sh | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/setup.sh b/setup.sh
index eff29db..32de718 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
+read -p "Do you want to enable non-free repos? [y/n]:" non_free
+[[ $non_free =~ ^[Yy]$ ]] && read -p "Do you want to install proprietary nvidia drivers? [y/n]: " nvidia_install
+
 read -p "Do you want to install configurations? [y/n]: " config_install
+read -p "Do you want to install my desktop environment? [y/n]: " desktop_install
 read -p "Do you want to install my st fork? [y/n]: " st_install
 read -p "Do you want to install Neovim? [y/n]: " neovim_install
 read -p "Do you want to install LaTeX? [y/n]: " latex_install
@@ -11,9 +15,6 @@ read -p "Do you want to install PHP and Composer? [y/n]: " php_install
 read -p "Do you want to install Node.js? [y/n]: " node_install
 read -p "Do you want to install Hugo? [y/n]: " hugo_install
 
-read -p "Do you want to enable non-free repos? [y/n]:" non_free
-[[ $non_free =~ ^[Yy]$ ]] && read -p "Do you want to install proprietary nvidia drivers? [y/n]: " nvidia_install
-
 read -p "Do you want to install Aerc? [y/n]: " aerc_install
 read -p "Do you want to install Qtile? [y/n]: " qtile_install
 read -p "Do you want to install termite? [y/n]: " termite_install
@@ -53,32 +54,21 @@ deb-src http://deb.debian.org/debian/ unstable main
 EOF
 fi
 
+echo "Updating system..."
 sudo cp /tmp/sources.list /etc/apt/sources.list
 sudo apt update
 sudo apt upgrade
 
-
 echo "Installing basic cli software..."
 sudo apt install -y gpg keychain git pass build-essential
 sudo apt install -y unzip wget curl rsync dnsutils tmux
 sudo apt install -y unrar-free
 
-
-echo "Installing Xorg, AwesomeWM, drivers..."
-sudo apt install -y xorg xorg-drivers xinit xterm pinentry-gtk-2 awesome
-[[ $nvidia_install =~ ^[Yy]$ ]] && sudo apt install nvidia-driver
-
-
-echo "Installing additional software for desktop usage..."
-sudo apt install -y fonts-dejavu fonts-firacode
-sudo apt install -y numlockx pcmanfm
-sudo apt install -y dunst libnotify-bin udiskie
-sudo apt install -y feh suckless-tools rofi scrot irssi
-sudo apt install -y thunderbird libreoffice
-sudo apt install -y zathura zathura-pdf-poppler
-sudo apt install -y newsboat ffmpeg mpd mpc ncmpcpp mpv
-sudo systemctl disable --now mpd
-sudo apt -t buster-backports install -y youtube-dl
+if [[ $nvidia_install =~ ^[Yy]$ ]]
+then
+  echo "Installing proprietary nvidia drivers..."
+  sudo apt install nvidia-driver
+fi
 
 ####################################################################################################
 
@@ -106,6 +96,23 @@ then
   cp -r /tmp/dotfiles/.local/bin $HOME/.local/
 fi
 
+if [[ $desktop_install =~ ^[Yy]$ ]]
+then
+  echo "Installing Xorg, AwesomeWM, utilities..."
+  sudo apt install -y xorg xorg-drivers xinit xterm pinentry-gtk-2 awesome
+
+  echo "Installing additional software for desktop usage..."
+  sudo apt install -y fonts-dejavu fonts-firacode
+  sudo apt install -y numlockx pcmanfm
+  sudo apt install -y dunst libnotify-bin udiskie
+  sudo apt install -y feh suckless-tools rofi scrot irssi
+  sudo apt install -y thunderbird libreoffice
+  sudo apt install -y zathura zathura-pdf-poppler
+  sudo apt install -y newsboat ffmpeg mpd mpc ncmpcpp mpv
+  sudo systemctl disable --now mpd
+  sudo apt -t buster-backports install -y youtube-dl
+fi
+
 if [[ $st_install =~ ^[Yy]$ ]]
 then
   echo "Installing my st fork..."
-- 
cgit v1.2.3