updated install script, new monitor config and added amd (ryzen) support to temp.sh

bash/.bashrc

@@ -5,13 +5,18 @@ function _update_ps1() {
     fi
 }
 
+# sourceIfExists
+function sourceIfExists () {
+    [[ -f "$1" ]] && source "$1"
+}
+
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 source ~/.alias
 source ~/.custom
 source ~/.variables
-source ~/lib/azure-cli/az.completion
+sourceIfExists ~/lib/azure-cli/az.completion
 
 # evals
 eval "$(pyenv init -)"

computers/dev-pc/xprofile.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
-xrandr --output DVI-I-0 --off --output DVI-I-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1 --off --output DVI-D-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal
+xrandr --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-D-1 --primary --mode 1920x1080 --pos 1936x0 --rotate normal --output HDMI-1 --off --output DP-1 --off

dependencies/aur.txt

@@ -1,15 +1,16 @@
-notify-osd-customizable
+visual-studio-code-insiders
-notifyconf
+i3blocks-contrib
 enpass-bin
 insync
-visual-studio-code-insiders
 ttf-font-awesome-4
 awesome-terminal-fonts-git
 otf-droid-sans-mono-powerline-git
 downgrade
+powerline-rs
 dive
 xorg-xev
 networkmanager-l2tp
 snapd
-i3blocks-contrib
 azure-cli
+notify-osd-customizable
+notifyconf

dependencies/pacman.txt

@@ -1,3 +1,4 @@
+base-devel
 xorg-server
 xorg-xinit
 mesa
@@ -9,6 +10,7 @@ scrot
 arandr
 chromium
 xfce4-terminal
+ttf-font-awesome
 sushi
 libconfig
 compton
@@ -26,7 +28,6 @@ python-pip
 gdm
 neofetch
 git
-networkmanager
 scrot
 acpi
 imagemagick
@@ -68,5 +69,13 @@ networkmanager-openvpn
 ranger
 w3m
 system-config-printer
-thunar
+nautilus 
-thunar-archive-plugin
+nautilus-share
+geany
+dotnet-host 
+dotnet-runtime
+dotnet-sdk
+dotnet-runtime-2.2
+dotnet-sdk-2.2
+wget
+pyenv

i3/scripts/blocks/temp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-temp=$(sensors | # execute sensors
+intelTemp=$(sensors | # execute sensors
 grep -w "Core 0:" | # grep for the first core
 sed 's/([^)]*)//g' | # filter
 tr -s " " | # remove whitespace
@@ -8,5 +8,13 @@ sed -e 's/Core 0\(.*\):/\1/' | #  get value between Core 0 and :
 cut -c 3- | rev | cut -c 7- | rev #remove clutter
 )
 
+amdTemp=$(sensors | grep -w "Tdie:" | sed 's/([^)]*)//g' | tr -s " " | cut -c 8- | rev | cut -c 6- | rev)
+
 # echo out the result
-echo $temp°C
+if [ -z "$intelTemp" ]
+then
+      echo $amdTemp
+else
+      echo $intelTemp°C
+fi
+

install.sh

@@ -62,8 +62,8 @@ function copyToDir {
 function install_fonts {
 	mkdir -p ~/.fonts
 	mkdir -p ~/.local/share/fonts
-	yes | cp -rf ./fonts/* ~/.fonts
+	cp -rf ./fonts/* ~/.fonts
-	yes | cp -rf ./fonts/* ~/.local/share/fonts
+	cp -rf ./fonts/* ~/.local/share/fonts
 }
 
 # install trizen, a aur helper
@@ -80,7 +80,7 @@ function install_config {
 
 	# link directories
 	linkDir "$PWD"/wallpapers ~/Pictures/Wallpapers
-	linkDir "$PWD"/i3/ ~/.config/i3
+	linkDir "$PWD"/i3 ~/.config/i3
 	linkDir "$PWD"/config/notify-osd/notify-osd ~/.notify-osd
 	linkDir "$PWD"/config/terminal/xfce4-term ~/.config/xfce4/terminal
 	linkDir "$PWD"/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/.config
@@ -117,7 +117,7 @@ function install_config {
 
 # Installs the dependencies on Arch Linux
 function install_dependencies {
-	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm --force -S
+	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm -S
 
 	install_trizen
 	fileToList dependencies/aur.txt | xargs trizen --force -S --noconfirm
@@ -132,20 +132,6 @@ function install_dependencies {
 # User output functions
 # =======================================
 
-# list the dependencies file
-function list_dependencies {
-	echo ""
-	echo "=========================="
-	echo ""
-	cat dependencies/pacman.txt
-	cat dependencies/aur.txt
-	cat dependencies/pip.txt
-	cat dependencies/npm.txt
-	echo ""
-	echo "=========================="
-	echo ""
-}
-
 # Run the intro bit
 function intro {
 	echo "___  ___          _                      _           _     _     _ "
@@ -197,8 +183,7 @@ intro
 ask "Do you want to continue installing my config and rice?" Y &&
 
 # Ask for dependency installation
-list_dependencies
+if ask "Do you want to install the applications listen in ./dependencies? (might prompt for password)" Y; then
-if ask "Do you want to install the list of applications above? (might prompt for password)" Y; then
     install_dependencies
 fi