Merge branch 'testing'

src/larbs.sh

@@ -37,21 +37,12 @@ options=(1 "LaTeX packages" off
          4 "Blender" off
 	 5 "Emacs" off
 	 6 "Fonts for unicode and other languages" off
-	 7 "transmission torrent client" off
+	 7 "Transmission torrent client" off
 	 8 "Music visualizers and decoration" off
 	 )
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
 echo $choices > /tmp/.choices
 
-brow=(dialog --separate-output --checklist "Select a browser (none or multiple possible):" 22 76 16)
-options=(1 "qutebrowser" off
-         2 "Firefox" off
-         3 "Palemoon" off
-         4 "Waterfox" off
-	 )
-browch=$("${brow[@]}" "${options[@]}" 2>&1 >/dev/tty)
-echo $browch > /tmp/.browch
-
 dialog --title "Let's get this party started!" --msgbox "The rest of the installation will now be totally automated, so you can sit back and relax.\n\nIt will take some time, but when done, you can relax even more with your complete system.\n\nNow just press <OK> and the system will begin installation!" 13 60
 
 clear
@@ -110,15 +101,16 @@ sleep .5
 
 
 blue \[1\/6\] Now installing main programs \(system basics\)...
+
+pacman --noconfirm --needed -Sy git base-devel
+
 pacman --noconfirm --needed -Sy \
-	base-devel \
 	xorg-xinit \
 	xorg-server \
 	compton \
 	arandr \
+	ttf-inconsolata \
 	noto-fonts \
-	rxvt-unicode \
-	urxvt-perls \
 	unzip \
 	unrar \
 	wget \
@@ -153,6 +145,7 @@ pacman --noconfirm --needed -Sy \
 	msmtp \
 	notmuch \
 	notmuch-mutt \
+	qutebrowser \
 	rsync \
 	newsboat || (red Error installing network packages. Check your internet connection and pacman keyring.)
 
@@ -170,7 +163,6 @@ pacman --noconfirm --needed -Sy \
 	ffmpeg \
 	pulseaudio \
 	pulseaudio-alsa \
-	pavucontrol \
 	pamixer \
 	mpd \
 	mpc \
@@ -186,7 +178,6 @@ pacman --noconfirm --needed -Sy \
 	python-dbus \
 	python-gobject \
 	discount \
-	git \
 	r \
 	highlight || (red Error installing devel packages. Check your internet connection and pacman keyring.)
 
@@ -284,20 +275,6 @@ cat << "EOF"
 
 EOF
 
-for choice in $browch
-do
-    case $choice in
-        1)
-		blue Now installing qutebrowser...
-	    pacman --noconfirm --needed -S qutebrowser gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
-            ;;
-        2)
-		blue Now installing Firefox...
-	    pacman --noconfirm --needed -S firefox
-            ;;
-    esac
-done
-
 cat << "EOF"
  ________________________
 < >tfw too hot to handle >
@@ -340,6 +317,15 @@ cat << "EOF"
  #    # #mmmmm #    #  #mm#  "mmm#"   #             #    #    # #mmmmm #    " #mmmmm   #
 EOF
 
+blue Installing st...
+
+cd /tmp
+git clone https://github.com/lukesmithxyz/st.git
+cd st
+patch < patches/transparency.diff
+make
+make install
+cd /tmp
 
 blue Enabling Network Manager...
 systemctl enable NetworkManager

src/larbs_user.sh

@@ -47,11 +47,11 @@ EOF
 
 gpg --recv-keys 5FAF0A6EE7371805 #Add the needed gpg key for neomutt
 
-aurcheck packer i3-gaps siji-git vim-pathogen tamzen-font-git neomutt unclutter-xfixes-git urxvt-resize-font-git polybar python-pywal xfce-theme-blackbird fzf-git || red Error with basic AUR installations...
+aurcheck packer i3-gaps siji-git vim-pathogen neomutt unclutter-xfixes-git polybar  xfce-theme-blackbird || red Error with basic AUR installations...
 #Also installing i3lock, since i3-gaps was only just now installed.
 sudo pacman -S --noconfirm --needed i3lock
 
-#packer --noconfirm -S ncpamixer-git speedometer cli-visualizer
+packer --noconfirm -S ncpamixer-git
 
 choices=$(cat /tmp/.choices)
 for choice in $choices
@@ -96,25 +96,10 @@ cat << "EOF"
 
 EOF
 
-
-
-browsers=$(cat /tmp/.browch)
-for choice in $browsers
-do
-	case $choice in
-		3)
-			gpg --recv-keys 865E6C87C65285EC #Key required for Palemoon install.
-			aurcheck palemoon-bin
-			;;
-		4)
-			aurcheck waterfox-bin
-			;;
-	esac
-done
-
 blue Downloading config files...
 git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice
 
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/welcome_i3 >> /home/$NAME/.config/i3/config
+
 blue Generating bash/ranger/qutebrowser shortcuts...
-cd /home/$NAME/
+bash /home/$NAME/.config/Scripts/shortcuts.sh
-python /home/$NAME/.config/Scripts/shortcuts.py

src/welcome_i3

@@ -0,0 +1,8 @@
+# LARBS WELCOME:
+exec_always $term -n welcome -e welcome
+for_window [instance="welcome"] floating enable
+for_window [instance="welcome"] resize set 625 400
+for_window [instance="welcome"] border pixel 0
+
+# WARNING! While the above welcome message is there, do not place commands below it!
+# They will be deleted by the "hello" bash command.

www/.htaccess

@@ -3,3 +3,4 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^([^\.]+)$ $1.html [NC,L]
 Redirect /larbs.sh https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/src/larbs.sh
 Redirect /arch.sh https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/src/arch.sh
+Redirect /testing.sh https://raw.githubusercontent.com/LukeSmithxyz/LARBS/testing/src/larbs.sh