Merge branch 'caianrais-repo-cleanup'

README.md

@@ -1,82 +0,0 @@
-# Luke's Auto-Rice Bootstraping Scripts (LARBS)
-
-[Official Website: larbs.xyz](http://larbs.xyz)
-
-This is a set of scripts either can either (1) install Arch Linux automatically with a typical Arch ISOed USB, and perhaps more prominently (2) automatically install and configure all of the prerequisites for an advanced Linux desktop environment, using my configs [here](https://github.com/LukeSmithxyz/voidrice) as a base.
-
-Really, the goal of this script is to start a kind of Linux meta-distribution which makes the more nuanced aspects of an advanced Linux setup available to even Linux newbies. Of course, it's also a great tool for advanced users who want to get into tiling window managers and just generally cool-looking and efficient worksetups.
-
-All the core stuff we be installed without prompt, but you'll have the option to install some of the larger non-essential packages (LaTeX, LibreOffice, Blender, etc.).
-
-## Installation
-
-### Installing my setup on an already existing Arch install
-
-This is just as easy. Log in as the root user and run the following.
-
-```
-curl -O http://larbs.xyz/larbs.sh #Downloads the script.
-bash larbs.sh #Runs it.
-```
-
-After prompting you for some settings and some package choices, the system will install my full i3-gaps tiling window manager Desktop Environment. If you don't know what that means, don't worry, because I've gone to great lengths to write readable instructions about how to go PRO super quick with this system.
-
-Finally, it will use `git` to download my [Voidrice](https://github.com/lukesmithxyz/voidrice) dotfiles and will plop them in their proper location for instant use!
-
-Then, finally, once that all is done, you should be able to log out, then log in as your newly created user and type `startx` to begin the graphical environment. Congrats!
-
-
-### Installing Arch Automatically
-
-I also have a script here for installing Arch automatically. I *only* wrote this script so I could quickly install then test the other scripts on new computers, but theoretically you could use it as well. *BUT* this is a lazy, pre-alpha script which does not give you many options (it automatically chooses the New York time zone, US English, GRUB, Network Manager, etc). Even more important, it automatically partitions /dev/sda without asking, so unless, you have no non-backed up data on your machine, I don't advise running it unless you don't mind a full wipe. That said, you can run it like this after booting into an Arch live environment:
-
-```
-curl -O http://larbs.xyz/arch.sh #Downloads the script.
-bash arch.sh #Runs it.
-```
-
-After the system installs, you'll have the option of bootstrapping automatically into installing my configs as well.
-
-## How to Use
-
-Once you're in the environment, just type Super/Mod/Windows+F1 to pull up a document that will explain everything.
-
-## Permission Details (sudoers file)
-
-These script will give your new created user (and those others you put in the `wheel` group) sudo access (with a password), but will also allow some commands to be run without any password confirmation. Those include:
-
-+ `shutdown`
-+ `reboot`
-+ `pacman -Syyu`/`pacman -Syu`
-+ `packer -Syyu`/`packer -Syu`
-+ `mount`
-+ `umount`
-+ `systemctl restart NetworkManager`
-
-Additionally, if you've put your password in a terminal window already, you will not need to repeat putting it in in other terminal windows.
-
-## Version
-
-We're basically on Version 2.0 now, which is still pretty primitive. I'm adding some error handling, if the script fails, check the contents of LARBS.log in whatever directory you've run the script. Still, this script is still in the Wild West, so I recommend only running it on fresh installs.
-
-## Why I made this
-
-When you've installed Arch Linux 6 gorrillian times like me, you get pretty sick of having to reproduce your favorite configuration on fresh installs over and over. When you're a C-list YouTube celebrity, it gets even more difficult when literally thousands of people ask you how to do X or get Y.
-
-The LARBS are a final solution to all of that. These scripts are to be run on a fresh install of Arch Linux, and they create a user, install all required programs and set up dotfiles directly from Github to give normal people a fairly sleek Linux configuration without hundreds of autsitic hours. I did the work, so why should you?
-
-I've also documented the configuration fairly well, check out the documentation on my **voidrice** repository for that.
-
-## Bugs?
-
-### When I type `startx` I get some kind of non-descript error!
-
-Some computers might require some additional drivers to run a graphical environment, for example, some ThinkPads might require you to install `xf86-video-intel`. If you search your model or graphics card along with "Arch Linux" on your preferred search engine, you'll probably get the answer fast.
-
-### I have some other problem and it didn't install correctly.
-
-In normal circumstances, there are two main causes of misinstalls: faulty internet connections and errors with particular package upgrades or with the pacman keyring. Check yourself if the former may be at fault, but feel free to inform me in the latter case; I may be able to provide a quick fix.
-
-### >still using systemd botnet distro and/or not a 100% free-as-in-freedumb Parabola GANOO slash Linocks
-
-I do plan on making an alternative script option for Parabola sooner or later, after all Parabola *is* the distro I actually use. If you want to use Arch OpenRC or another Arch-based non-systemd distro, I think this script still *should* work, although you may have to manually enable Network Manager or Pulseaudio. I haven't tested this though. If you have, tell me the results and I might implement it.

README.md

@@ -0,0 +1 @@
+docs/README.md

docs/README.md

@@ -0,0 +1,156 @@
+# Luke's Auto-Rice Bootstraping Scripts (LARBS)
+
+[Official Website: larbs.xyz](http://larbs.xyz)
+
+This is a set of scripts either can either (1) install Arch Linux automatically
+with a typical Arch ISOed USB, and perhaps more prominently (2) automatically
+install and configure all of the prerequisites for an advanced Linux desktop
+environment, using my configs [here](https://github.com/LukeSmithxyz/voidrice)
+as a base.
+
+
+## Table of Contents
+
+ - [About](#about)
+ - [Installation](#installation)
+   - [On an already existing Arch install](#on-an-already-existing-arch-install)
+   - [Installing Arch automatically](#installing-arch-automatically)
+ - [How to Use](#how-to-use)
+ - [Permission Details (sudoers file)](#permission-details-sudoers-file)
+ - [Version](#version)
+ - [Why I made this](#why-i-made-this)
+ - [Bugs?](#bugs)
+
+
+## About
+
+Really, the goal of this script is to start a kind of Linux meta-distribution
+which makes the more nuanced aspects of an advanced Linux setup available to
+even Linux newbies. Of course, it's also a great tool for advanced users who
+want to get into tiling window managers and just generally cool-looking and
+efficient worksetups.
+
+All the core stuff we be installed without prompt, but you'll have the option
+to install some of the larger non-essential packages (LaTeX, LibreOffice,
+Blender, etc.).
+
+
+## Installation
+
+### On an already existing Arch install
+
+This is just as easy. Log in as the root user and run the following.
+
+```sh
+curl -O http://larbs.xyz/larbs.sh #Downloads the script.
+bash larbs.sh #Runs it.
+```
+
+After prompting you for some settings and some package choices, the system will
+install my full i3-gaps tiling window manager Desktop Environment. If you don't
+know what that means, don't worry, because I've gone to great lengths to write
+readable instructions about how to go PRO super quick with this system.
+
+Finally, it will use `git` to download my
+[Voidrice](https://github.com/lukesmithxyz/voidrice)
+dotfiles and will plop them in their proper location for instant use!
+
+Then, finally, once that all is done, you should be able to log out, then log in
+as your newly created user and type `startx` to begin the graphical environment.
+Congrats!
+
+### Installing Arch automatically
+
+I also have a script here for installing Arch automatically. I *only* wrote this
+script so I could quickly install then test the other scripts on new computers,
+but theoretically you could use it as well. *BUT* this is a lazy, pre-alpha
+script which does not give you many options (it automatically chooses the New
+York time zone, US English, GRUB, Network Manager, etc). Even more important, it
+automatically partitions /dev/sda without asking, so unless, you have no
+non-backed up data on your machine, I don't advise running it unless you don't
+mind a full wipe. That said, you can run it like this after booting into an Arch
+live environment:
+
+```sh
+curl -O http://larbs.xyz/arch.sh #Downloads the script.
+bash arch.sh #Runs it.
+```
+
+After the system installs, you'll have the option of bootstrapping automatically
+into installing my configs as well.
+
+
+## How to Use
+
+Once you're in the environment, just type `Super` / `Mod` / `Windows` + `F1` to
+pull up a document that will explain everything.
+
+
+## Permission Details (sudoers file)
+
+These script will give your new created user (and those others you put in the
+`wheel` group) sudo access (with a password), but will also allow some commands
+to be run without any password confirmation. Those include:
+
++ `shutdown`
++ `reboot`
++ `pacman -Syyu`/`pacman -Syu`
++ `packer -Syyu`/`packer -Syu`
++ `mount`
++ `umount`
++ `systemctl restart NetworkManager`
+
+Additionally, if you've put your password in a terminal window already, you will
+not need to repeat putting it in in other terminal windows.
+
+
+## Version
+
+We're basically on Version 2.0 now, which is still pretty primitive. I'm adding
+some error handling, if the script fails, check the contents of LARBS.log in
+whatever directory you've run the script. Still, this script is still in the
+Wild West, so I recommend only running it on fresh installs.
+
+
+## Why I made this
+
+When you've installed Arch Linux 6 gorrillian times like me, you get pretty sick
+of having to reproduce your favorite configuration on fresh installs over and
+over. When you're a C-list YouTube celebrity, it gets even more difficult when
+literally thousands of people ask you how to do X or get Y.
+
+The LARBS are a final solution to all of that. These scripts are to be run on a
+fresh install of Arch Linux, and they create a user, install all required
+programs and set up dotfiles directly from Github to give normal people a fairly
+sleek Linux configuration without hundreds of autsitic hours. I did the work, so
+why should you?
+
+I've also documented the configuration fairly well, check out the documentation
+on my **voidrice** repository for that.
+
+
+## Bugs?
+
+### When I type `startx` I get some kind of non-descript error!
+
+Some computers might require some additional drivers to run a graphical
+environment, for example, some ThinkPads might require you to install
+`xf86-video-intel`. If you search your model or graphics card along with "Arch
+Linux" on your preferred search engine, you'll probably get the answer fast.
+
+### I have some other problem and it didn't install correctly.
+
+In normal circumstances, there are two main causes of misinstalls: faulty
+internet connections and errors with particular package upgrades or with the
+pacman keyring. Check yourself if the former may be at fault, but feel free to
+inform me in the latter case; I may be able to provide a quick fix.
+
+### >still using systemd botnet distro and/or not a 100% free-as-in-freedumb Parabola GANOO slash Linocks
+
+I do plan on making an alternative script option for Parabola sooner or later,
+after all Parabola *is* the distro I actually use. If you want to use Arch
+OpenRC or another Arch-based non-systemd distro, I think this script still
+*should* work, although you may have to manually enable Network Manager or
+Pulseaudio. I haven't tested this though. If you have, tell me the results and
+I might implement it.
+

src/larbs.sh

@@ -12,12 +12,12 @@ dialog --title "Welcome!" --msgbox "Welcome to Luke's Auto-Rice Bootstrapping Sc
 dialog --no-cancel --inputbox "First, please enter a name for the user account." 10 60 2> /tmp/.name
 
 dialog --no-cancel --passwordbox "Enter a password for that user." 10 60 2> /tmp/.pass1
-dialog --no-cancel --passwordbox "Reype password." 10 60 2> /tmp/.pass2
+dialog --no-cancel --passwordbox "Retype password." 10 60 2> /tmp/.pass2
 
 while [ $(cat /tmp/.pass1) != $(cat /tmp/.pass2) ]
 do
 	dialog --no-cancel --passwordbox "Passwords do not match.\n\nEnter password again." 10 60 2> /tmp/.pass1
-	dialog --no-cancel --passwordbox "Reype password." 10 60 2> /tmp/.pass2
+	dialog --no-cancel --passwordbox "Retype password." 10 60 2> /tmp/.pass2
 done
 
 chmod 777 /tmp/.name
@@ -108,9 +108,89 @@ cat << "EOF"
 EOF
 sleep .5
 
-blue Now installing main programs...
 
-pacman --noconfirm --needed -Sy base-devel xorg-xinit xorg-server noto-fonts rxvt-unicode feh ffmpeg pulseaudio pulseaudio-alsa wireless_tools arandr pavucontrol pamixer mpv wget rofi vim w3m ranger mediainfo poppler highlight tmux calcurse htop newsboat mpd mpc ncmpcpp network-manager-applet networkmanager imagemagick atool libcaca compton transset-df markdown mupdf evince rsync git youtube-dl youtube-viewer cups scrot unzip unrar ntfs-3g offlineimap msmtp notmuch notmuch-mutt dosfstools r pandoc python-dbus python-gobject xf86-video-intel || (red Error installing basic packages. Check your internet connection and pacman keyring.)
+blue \[1\/6\] Now installing main programs \(system basics\)...
+pacman --noconfirm --needed -Sy \
+	base-devel \
+	xorg-xinit \
+	xorg-server \
+	compton \
+	arandr \
+	noto-fonts \
+	rxvt-unicode \
+	unzip \
+	unrar \ 
+	wget \
+	atool \
+	ntfs-3g \
+	xf86-video-intel \
+ 	dosfstools \
+	cups \
+	transset-df \
+	htop || (red Error installing system basics. Check your internet connection and pacman keyring.)
+
+
+blue \[2\/6\] Now installing main programs \(productivity\)...
+pacman --noconfirm --needed -Sy \
+	calcurse \
+	ranger \
+	vim \
+	tmux \
+	rofi \
+	poppler \
+	mupdf \
+	evince \
+	pandoc || (red Error installing productivity packages. Check your internet connection and pacman keyring.)
+
+
+blue \[3\/6\] Now installing main programs \(network and internet\)...
+pacman --noconfirm --needed -Sy \
+	wireless_tools \
+	network-manager-applet \
+	networkmanager \
+	w3m \
+	offlineimap \
+	msmtp \
+	notmuch \
+	notmuch-mutt \
+	rsync \
+	newsboat || (red Error installing network packages. Check your internet connection and pacman keyring.)
+
+
+blue \[4\/6\] Now installing main programs \(graphics\)...
+pacman --noconfirm --needed -Sy \
+	feh \
+	imagemagick \
+	scrot \
+	libcaca || (red Error installing graphic packages. Check your internet connection and pacman keyring.)
+
+
+blue \[5\/6\] Now installing main programs \(audio\)...
+pacman --noconfirm --needed -Sy \
+	ffmpeg \
+	pulseaudio \
+	pulseaudio-alsa \
+	pavucontrol \
+	pamixer \
+	mpd \
+	mpc \
+	ncmpcpp \
+	youtube-dl \
+	youtube-viewer \
+	mediainfo \
+	mpv || (red Error installing audio packages. Check your internet connection and pacman keyring.)
+
+
+blue \[6\/6\] Now installing main programs \(devel\)...
+pacman --noconfirm --needed -Sy \
+	python-dbus \
+	python-gobject \
+	markdown \
+	git \
+	r \
+	highlight || (red Error installing devel packages. Check your internet connection and pacman keyring.)
+
+
 pacman --noconfirm --needed -S fzf || (red Error with peripheral programs.)
 
 cat << "EOF"
@@ -234,12 +314,12 @@ cat << "EOF"
                  ||    ||     
 EOF
 
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/sudoers_tmp > /etc/sudoers 
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers_tmp > /etc/sudoers 
 
 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/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
 
@@ -262,7 +342,7 @@ rmmod pcspkr
 echo "blacklist pcspkr" > /etc/modprobe.d/nobeep.conf
 
 blue Implementing temporary sudoers file...
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/sudoers > /etc/sudoers 
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers > /etc/sudoers 
 
 dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\n\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment.\n\n-Luke" 12 80
 clear

src/larbsp.sh

@@ -234,12 +234,12 @@ cat << "EOF"
                  ||    ||     
 EOF
 
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/sudoers_tmp > /etc/sudoers 
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers_tmp > /etc/sudoers 
 
 cd /tmp
 blue Changing working directory to /tmp/...
 blue Downloading next portion of the script \(larbs_userp.sh\)...
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/larbs_userp.sh > /tmp/larbs_userp.sh && blue Running larbs_userp.sh script as $NAME...
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/larbs_userp.sh > /tmp/larbs_userp.sh && blue Running larbs_userp.sh script as $NAME...
 sudo -u $NAME bash /tmp/larbs_userp.sh || red Error when running larbs_userp.sh...
 rm -f /tmp/larbs_userp.sh
 
@@ -262,7 +262,7 @@ rmmod pcspkr
 echo "blacklist pcspkr" > /etc/modprobe.d/nobeep.conf
 
 blue Implementing temporary sudoers file...
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/sudoers > /etc/sudoers 
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers > /etc/sudoers 
 
 dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\n\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment.\n\n-Luke" 12 80
 clear