From fb4f5719d3194e8b85663f1e3a8d79a832228f08 Mon Sep 17 00:00:00 2001
From: Mastermindzh <info@rickvanlieshout.com>
Date: Fri, 4 May 2018 19:28:02 +0200
Subject: [PATCH] fixed powerline-shell, added HiDPI things (new laptop, yay)

---
 bash/.bashrc            |  4 ++-
 config/rofi             |  8 +++++
 config/xorg/Xresources  |  3 ++
 config/xorg/xinitrc     |  1 +
 dependencies/pacman.txt | 14 +++++++++
 install.sh              | 65 ++++++++++++++++++++++++++++++++---------
 6 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 config/rofi
 create mode 100644 config/xorg/Xresources
 create mode 100644 config/xorg/xinitrc

diff --git a/bash/.bashrc b/bash/.bashrc
index ab5616e..0c30c19 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -3,7 +3,9 @@
 #
 
 function _update_ps1() {
-    PS1=$(powerline-shell $?)
+    if hash powerline-shell 2>/dev/null; then
+        PS1=$(powerline-shell $?)
+    fi
 }
 
 source ~/.alias
diff --git a/config/rofi b/config/rofi
new file mode 100644
index 0000000..c9572f2
--- /dev/null
+++ b/config/rofi
@@ -0,0 +1,8 @@
+rofi.color-window: #273238, #273238, #1e2529
+rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff
+rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4
+rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844
+
+rofi.lines: 10
+rofi.line-padding: 15
+rofi.font: monospace 10
diff --git a/config/xorg/Xresources b/config/xorg/Xresources
new file mode 100644
index 0000000..797eb58
--- /dev/null
+++ b/config/xorg/Xresources
@@ -0,0 +1,3 @@
+Xft.dpi: 200
+Xft.antialias: 1
+rofi.dpi: 275
\ No newline at end of file
diff --git a/config/xorg/xinitrc b/config/xorg/xinitrc
new file mode 100644
index 0000000..80254c6
--- /dev/null
+++ b/config/xorg/xinitrc
@@ -0,0 +1 @@
+xrdb -merge ~/.Xresources
\ No newline at end of file
diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt
index 499deb1..85236af 100644
--- a/dependencies/pacman.txt
+++ b/dependencies/pacman.txt
@@ -27,3 +27,17 @@ python-pip
 gdm
 neofetch
 git
+networkmanager
+scrot
+acpi
+imagemagick
+docker
+docker-compose
+htop
+powertop
+network-manager-applet
+pavucontrol
+alsa-utils
+ntp
+xclip
+openssh
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 143adcb..866b5e6 100644
--- a/install.sh
+++ b/install.sh
@@ -5,13 +5,34 @@
 # =======================================
 
 # Ask a question and return true or false based on the users input
-function yes_or_no {
+ask() {
+    # from https://djm.me/ask
+    local prompt default reply
+
     while true; do
-        read -p "$* [y/n]: " yn
-        case $yn in
-            [Yy]*) return 0  ;;
-            [Nn]*) echo "Aborted" ; return  1 ;;
+
+        if [ "${2:-}" = "Y" ]; then
+            prompt="Y/n"
+            default=Y
+        elif [ "${2:-}" = "N" ]; then
+            prompt="y/N"
+            default=N
+        else
+            prompt="y/n"
+            default=
+        fi
+        echo -n "$1 [$prompt] "
+        read reply </dev/tty
+
+        if [ -z "$reply" ]; then
+            reply=$default
+        fi
+
+        case "$reply" in
+			[Yy]*) return 0  ;;
+            [Nn]*) return  1 ;;
         esac
+
     done
 }
 
@@ -65,6 +86,7 @@ function install_config {
 	ln -sf "$PWD"/config/nano/.nanorc ~/.nanorc
 	ln -sf "$PWD"/bash/.powerline-shell.json ~/.powerline-shell.json
 	ln -sf "$PWD"/wallpapers/space.jpg ~/Pictures/Wallpapers/wallpaper.jpg
+	ln -sf "$PWD"/config/rofi ~/.config/rofi/config
 
 	# link system files
 	sudo ln -sf "$PWD"/config/package-managers/pacman.conf /etc/pacman.conf
@@ -73,14 +95,19 @@ function install_config {
 
 }
 
+function install_HiDPI {
+	ln -sf "$PWD"/config/xorg/xinitrc ~/.xinitrc
+	ln -sf "$PWD"/config/xorg/Xresources ~/.Xresources
+}
+
 # Installs the dependencies on Arch Linux
 function install_dependencies {
-	fileToList dependencies/pacman.txt | xargs sudo pacman --force -S
+	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm --force -S
 
 	install_trizen
 	fileToList dependencies/aur.txt | xargs trizen --force -S --noconfirm
 
-	fileToList dependencies/pip.txt | xargs pip install
+	fileToList dependencies/pip.txt | xargs sudo pip install
 }
 
 
@@ -130,19 +157,31 @@ function intro {
 # Run the intro function
 intro
 
-yes_or_no "Do you want to continue installing my config and rice?" &&
+ask "Do you want to continue installing my config and rice?" Y &&
 
 # Ask for dependency installation
 list_dependencies
-yes_or_no "Do you want to install the list of applications above? (might prompt for password)" && install_dependencies
+if ask "Do you want to install the list of applications above? (might prompt for password)" Y; then
+    install_dependencies
+fi
 
 # Ask for config installation
-yes_or_no "Do you want to install the config files?" && install_config
+if ask "Do you want to install the config files?" Y; then
+    install_config
+fi
+
+# Ask for HiDPI installation
+if ask "Do you want to continue install the HiDPI patches?" N; then
+    install_HiDPI
+fi
 
 # Ask for font installation
-yes_or_no "Do you want to install the fonts?" && install_fonts
-
+if ask "Do you want to install the fonts?" Y; then
+    install_fonts
+fi
 # ask to enable gdm
-yes_or_no "Do you want to enable GDM?" && sudo systemctl enable gdm.service
+if ask "Do you want to enable GDM?" Y; then
+    sudo systemctl enable gdm.service
+fi
 
 echo "Enjoy using my rice! Do not forget to select \"i3\" in GDM :)"