From 6ba547382d1f0eeb13f454be63d1230c0fbd723c Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 19 Jan 2018 18:07:48 -0700 Subject: [PATCH 01/10] based qutebrowser now confirmed standard browser --- src/larbs.sh | 24 +----------------------- src/larbs_user.sh | 16 ---------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/src/larbs.sh b/src/larbs.sh index a73f630..6d5fab4 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -43,15 +43,6 @@ options=(1 "LaTeX packages" 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 and the system will begin installation!" 13 60 clear @@ -153,6 +144,7 @@ pacman --noconfirm --needed -Sy \ msmtp \ notmuch \ notmuch-mutt \ + qutebrowser \ rsync \ newsboat || (red Error installing network packages. Check your internet connection and pacman keyring.) @@ -284,20 +276,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 > diff --git a/src/larbs_user.sh b/src/larbs_user.sh index 360704e..6f3857f 100755 --- a/src/larbs_user.sh +++ b/src/larbs_user.sh @@ -96,22 +96,6 @@ 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 From 09d693bd5bbc5516d37ba5d00928815f716e131f Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 19 Jan 2018 18:09:31 -0700 Subject: [PATCH 02/10] le urxvt BLOAT removed --- src/larbs.sh | 2 -- src/larbs_user.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/larbs.sh b/src/larbs.sh index 6d5fab4..4b3020d 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -108,8 +108,6 @@ pacman --noconfirm --needed -Sy \ compton \ arandr \ noto-fonts \ - rxvt-unicode \ - urxvt-perls \ unzip \ unrar \ wget \ diff --git a/src/larbs_user.sh b/src/larbs_user.sh index 6f3857f..d06ffc7 100755 --- a/src/larbs_user.sh +++ b/src/larbs_user.sh @@ -47,7 +47,7 @@ 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 tamzen-font-git neomutt unclutter-xfixes-git polybar python-pywal xfce-theme-blackbird fzf-git || red Error with basic AUR installations... #Also installing i3lock, since i3-gaps was only just now installed. sudo pacman -S --noconfirm --needed i3lock From 76f6998de14b8663c4478a63bd9e2f982c6ac6b5 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 20 Jan 2018 02:52:19 -0700 Subject: [PATCH 03/10] suckless terminal install added --- src/larbs.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/larbs.sh b/src/larbs.sh index 4b3020d..c4c33a9 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -101,6 +101,15 @@ sleep .5 blue \[1\/6\] Now installing main programs \(system basics\)... + +pacman --noconfirm --needed -Sy git + +cd /tmp +git clone https://github.com/lukesmithxyz/st.git +cd st +patch < patches/transparency.diff +make && make install + pacman --noconfirm --needed -Sy \ base-devel \ xorg-xinit \ @@ -176,7 +185,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.) From 5039b83a4c8d6e45de152a4c1ed5c57bf3050d2e Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 20 Jan 2018 10:17:32 -0700 Subject: [PATCH 04/10] general cleanup, testing redirect added --- src/larbs.sh | 10 +++++----- src/larbs_user.sh | 7 +++---- www/.htaccess | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/larbs.sh b/src/larbs.sh index c4c33a9..93db4b4 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -37,7 +37,7 @@ 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) @@ -102,20 +102,21 @@ sleep .5 blue \[1\/6\] Now installing main programs \(system basics\)... -pacman --noconfirm --needed -Sy git +pacman --noconfirm --needed -Sy git base-devel cd /tmp git clone https://github.com/lukesmithxyz/st.git cd st patch < patches/transparency.diff make && make install +cd /tmp pacman --noconfirm --needed -Sy \ - base-devel \ xorg-xinit \ xorg-server \ compton \ arandr \ + ttf-inconsolata \ noto-fonts \ unzip \ unrar \ @@ -169,7 +170,6 @@ pacman --noconfirm --needed -Sy \ ffmpeg \ pulseaudio \ pulseaudio-alsa \ - pavucontrol \ pamixer \ mpd \ mpc \ @@ -303,7 +303,7 @@ curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers_tmp cd /tmp blue Changing working directory to /tmp/... blue Downloading next portion of the script \(larbs_user.sh\)... -curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME... +curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/testing/src/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME... sudo -u $NAME bash /tmp/larbs_user.sh || red Error when running larbs_user.sh... rm -f /tmp/larbs_user.sh diff --git a/src/larbs_user.sh b/src/larbs_user.sh index d06ffc7..744299c 100755 --- a/src/larbs_user.sh +++ b/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 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 fzf-git || 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 @@ -100,5 +100,4 @@ blue Downloading config files... git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice blue Generating bash/ranger/qutebrowser shortcuts... -cd /home/$NAME/ -python /home/$NAME/.config/Scripts/shortcuts.py +bash /home/$NAME/.config/Scripts/shortcuts.sh diff --git a/www/.htaccess b/www/.htaccess index 5087f2e..5695230 100644 --- a/www/.htaccess +++ b/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 From 2f808da07aaf3d8fd2e5113540e6a673ee80495d Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 20 Jan 2018 12:49:35 -0700 Subject: [PATCH 05/10] fix in case of st make error --- src/larbs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/larbs.sh b/src/larbs.sh index 93db4b4..57fc75f 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -108,7 +108,8 @@ cd /tmp git clone https://github.com/lukesmithxyz/st.git cd st patch < patches/transparency.diff -make && make install +make +make install cd /tmp pacman --noconfirm --needed -Sy \ From fb5cc32d9bfe038b886570f52a6bb2590c57edd6 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 20 Jan 2018 15:27:11 -0700 Subject: [PATCH 06/10] welcome system added --- src/larbs_user.sh | 2 ++ src/welcome_i3 | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 src/welcome_i3 diff --git a/src/larbs_user.sh b/src/larbs_user.sh index 744299c..dcf1fa2 100755 --- a/src/larbs_user.sh +++ b/src/larbs_user.sh @@ -99,5 +99,7 @@ EOF 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/testing/src/welcome_i3 >> /home/$NAME/.config/i3/config + blue Generating bash/ranger/qutebrowser shortcuts... bash /home/$NAME/.config/Scripts/shortcuts.sh diff --git a/src/welcome_i3 b/src/welcome_i3 new file mode 100644 index 0000000..096d239 --- /dev/null +++ b/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. From c678e452a141c8dd99dffb3aa05846dd7188e455 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 20 Jan 2018 16:28:28 -0700 Subject: [PATCH 07/10] using testing branch --- src/larbs_user.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/larbs_user.sh b/src/larbs_user.sh index dcf1fa2..f2cb186 100755 --- a/src/larbs_user.sh +++ b/src/larbs_user.sh @@ -47,7 +47,7 @@ EOF gpg --recv-keys 5FAF0A6EE7371805 #Add the needed gpg key for neomutt -aurcheck packer i3-gaps siji-git vim-pathogen neomutt unclutter-xfixes-git polybar 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 @@ -97,7 +97,7 @@ cat << "EOF" EOF blue Downloading config files... -git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice +git clone -b testing https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/testing/src/welcome_i3 >> /home/$NAME/.config/i3/config From 35c9b2e90522d4e61029effc61c4f92a81b4f005 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 20 Jan 2018 17:06:52 -0700 Subject: [PATCH 08/10] reversion to master --- src/larbs.sh | 2 +- src/larbs_user.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/larbs.sh b/src/larbs.sh index 57fc75f..79a927c 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -304,7 +304,7 @@ curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers_tmp cd /tmp blue Changing working directory to /tmp/... blue Downloading next portion of the script \(larbs_user.sh\)... -curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/testing/src/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME... +curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME... sudo -u $NAME bash /tmp/larbs_user.sh || red Error when running larbs_user.sh... rm -f /tmp/larbs_user.sh diff --git a/src/larbs_user.sh b/src/larbs_user.sh index f2cb186..edccc36 100755 --- a/src/larbs_user.sh +++ b/src/larbs_user.sh @@ -97,9 +97,9 @@ cat << "EOF" EOF blue Downloading config files... -git clone -b testing https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice +git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice -curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/testing/src/welcome_i3 >> /home/$NAME/.config/i3/config +curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/welcome_i3 >> /home/$NAME/.config/i3/config blue Generating bash/ranger/qutebrowser shortcuts... bash /home/$NAME/.config/Scripts/shortcuts.sh From 1996a03b721dd3ba177b4e9fcc7f3ab391af388c Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 22 Jan 2018 10:30:07 -0700 Subject: [PATCH 09/10] st installation moved to end --- src/larbs.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/larbs.sh b/src/larbs.sh index 79a927c..7150bb4 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -104,14 +104,6 @@ blue \[1\/6\] Now installing main programs \(system basics\)... pacman --noconfirm --needed -Sy git base-devel -cd /tmp -git clone https://github.com/lukesmithxyz/st.git -cd st -patch < patches/transparency.diff -make -make install -cd /tmp - pacman --noconfirm --needed -Sy \ xorg-xinit \ xorg-server \ @@ -317,6 +309,17 @@ 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 From 351fa4ff8efb735f920f8fb9be4f0851fb0403e2 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 22 Jan 2018 10:42:39 -0700 Subject: [PATCH 10/10] st fix? --- src/larbs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/larbs.sh b/src/larbs.sh index 7150bb4..b6dd0a9 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -319,8 +319,6 @@ make make install cd /tmp - - blue Enabling Network Manager... systemctl enable NetworkManager systemctl start NetworkManager