Update arch install and setup scripts. Add paq clone to the install script

2 files changed, 265 insertions, 15 deletions

diff --git a/distro/arch-install.sh b/distro/arch-install.sh
new file mode 100755
index 0000000..6cfb095
--- /dev/null
+++ b/distro/arch-install.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+set -ex
+
+do_edit() {
+printf "Edit \"$1\" ? : "
+read -r resp
+case $resp in
+	Y|y) arch-chroot "${_install_path}" nvim "$1" ;;
+	*) ;;
+esac
+}
+
+do_chroot() {
+	arch-chroot "$_install_path"  "$@"
+}
+
+_install_path="${INSTALL_PATH:-/mnt}"
+_tz="${TZ:-America/New_York}"
+_hostname="${INSTALL_HOSTNAME:-arch}"
+PACSTRAP="${PACSTRAP:-1}"
+
+set +x
+if ! awk '{print $2}' /proc/mounts | grep -q '^'"$_install_path"'$' ; then
+	echo "Cannot install to \"$_install_path\" because it is not a mountpoint"
+	echo "if you've mounted somewhere other than /mnt use:"
+	echo "	env INSTALL_PATH=<path> ./arch-install.sh"
+	echo where '<path>' is the mount point in question
+	exit 1
+fi
+set -x
+
+if [ $PACSTRAP -eq 1 ] ; then
+pacstrap -K "$_install_path" \
+	arch-install-scripts \
+	base \
+	base-devel \
+	cryptsetup \
+	dosfstools \
+	e2fsprogs \
+	efibootmgr \
+	git \
+	gptfdisk \
+	grub \
+	linux \
+	linux-firmware \
+	linux-firmware-marvell \
+	lvm2 \
+	networkmanager \
+	nvim \
+	sof-firmware \
+	tmux \
+	xfsprogs \
+
+fi
+
+
+genfstab -U "$_install_path" >> "${_install_path}/etc/fstab"
+
+do_edit /etc/fstab
+
+do_edit /etc/locale.gen
+
+do_chroot locale-gen
+
+do_chroot ln -sf "/usr/share/zoneinfo/$_tz" /etc/localtime
+
+do_edit /etc/mkinitcpio.conf
+
+do_chroot mkinitcpio -p linux
+
+do_edit /etc/default/grub
+
+do_chroot grub-install --target=x86_64-efi --removable --efi-directory=/boot/efi
+
+do_chroot grub-mkconfig -o /boot/grub/grub.cfg
+
+do_chroot passwd
diff --git a/distro/arch.sh b/distro/arch.sh
index 528ccca..72b5db4 100755
--- a/distro/arch.sh
+++ b/distro/arch.sh
@@ -1,11 +1,33 @@
 #!/bin/sh
 set -e
-if [ "$(id -u)" -ne 0 ] ; then
-	echo "Run as root"
+if [ "$(id -u)" -eq 0 ] ; then
+	echo "Run as normal user w/ sudo access"
 	exit 1;
 fi
 
-# Todo add in sipcalc, it's in the AUR now...
+codedir="$HOME/scm"
+okshdir="${codedir}/pub/ibara-oksh"
+rivercfgdir="${codedir}/wl/rivercfg"
+yaydir="${codedir}/pub/yay"
+
+GRAPHICS="${GRAPHICS:-yes}"
+THUNDERBOLT="${THUNDERBOLT:-yes}"
+PACKAGES="${PACKAGES:-yes}"
+FONTS="${FONTS:-yes}"
+YAY="${YAY:-yes}"
+BRAVE="${BRAVE:-yes}"
+OKSH="${OKSH:-yes}"
+RIVER="${RIVER:-yes}"
+V4L2LOOPBACK="${V4L2LOOPBACK:-yes}"
+LOGIND="${LOGIND:-yes}"
+DWM="${DWM:-no}"
+DPW="${DPW:-yes}"
+
+dpwdir="${codedir}/me/dpw"
+dwmdir="${codedir}/x/dwm"
+dwmStdir="${codedir}/x/st"
+dwmDmenudir="${codedir}/x/dmenu"
+dwmSesdir="${codedir}/x/session"
 
 pkgs="
 alsa-utils
@@ -31,6 +53,7 @@ ethtool
 evince
 evolution
 exfat-utils
+fastfetch
 feh
 firefox
 fuse
@@ -46,16 +69,12 @@ inkscape
 iotop
 iperf3
 kdenlive
+less
 libconfig # dmenu-pinentry
 libfido2
 libvirt # If you want
 libxcb
 libxkbcommon
-lightdm
-lightdm-gtk-greeter
-linux
-linux-firmware
-linux-zen
 lvm2
 lxappearance
 man-pages
@@ -96,11 +115,12 @@ qemu
 qt5ct # https://wiki.archlinux.org/title/qt#Appearance
 rclone
 redshift
+ripgrep
 rsync
 scrot
+sddm
 seahorse
 shellcheck
-shellcheck
 smartmontools
 speedtest-cli
 swig # ykman
@@ -134,30 +154,178 @@ zathura-ps
 zstd
 "
 
+if [ "$PACKAGES" = "yes" ] ; then
 #shellcheck disable=SC2046
-pacman -S --needed $(echo "$pkgs" | awk '{print $1}' | tr '\n' ' ')
+sudo pacman -S --needed $(echo "$pkgs" | awk '{print $1}' | tr '\n' ' ')
+fi
 
+if [ "$LOGIND" = "yes" ] ; then
+fn="/etc/systemd/logind.conf"
+bak="$fn.$(date +%s)"
+sudo cp "$fn" "$bak"
+sudo sed -i -E -e 's/^.*KillUserProcesses=.*$/KillUserProcesses=yes/g' "$fn"
+sudo sed -i -E -e 's/^.*HandleLidSwitch=.*$/HandleLidSwitch=ignore/g' "$fn"
+if sudo diff -q "$fn" "$bak" >/dev/null ; then
+	sudo rm "$bak"
+fi
+fi
 
 grep -q '^KillUserProcesses=yes'  /etc/systemd/logind.conf || \
 	echo "You may want to set KillUserProcesses=yes in /etc/systemd/logind.conf"
 grep -q '^HandleLidSwitch=ignore' /etc/systemd/logind.conf || \
 	echo "You may want to set HandleLidSwitch=ignore in /etc/systemd/logind.conf"
 
-cat > /etc/udev/rules.d/99-removable.rules <<EOF
+if [ "$THUNDERBOLT" = "yes" ] ; then
+sudo sh -c 'cat > /etc/udev/rules.d/99-removable.rules <<EOF
 # /etc/udev/rules.d/99-removable.rules
 ACTION=="add", SUBSYSTEM=="thunderbolt", ATTR{authorized}=="0", ATTR{authorized}="1"
-EOF
+EOF'
+fi
 
 
-cat > /etc/modprobe.d/v4l2loopback.conf <<EOF
+if [ "$V4L2LOOPBACK" = yes ] ; then
+sudo sh -c 'cat > /etc/modprobe.d/v4l2loopback.conf <<EOF
 options v4l2loopback video_nr=10,11,12 card_label="OBS Virtual Camera,Extra Loopback 1,Extra Loopback 2"
-EOF
+EOF'
 
-cat > /etc/modules-load.d/v4l2loopback.conf <<EOF
+sudo sh -c 'cat > /etc/modules-load.d/v4l2loopback.conf <<EOF
 v4l2loopback
+EOF'
+fi
+
+if [ "$OKSH" = yes ] ; then
+	if ! [ -d "$okshdir" ] ; then
+		git clone https://github.com/ibara/oksh "$okshdir"
+	fi
+	cd "$okshdir"
+	git checkout oksh-7.6
+	./configure
+	make
+	sudo make install
+	cd -
+
+	if ! grep /usr/local/bin/oksh /etc/shells ; then
+		sudo sh -c 'echo /usr/local/bin/oksh >> /etc/shells'
+	fi
+
+	if ! grep -qF 'export ENV=$HOME/.kshrc' ~/.profile; then
+		echo 'export ENV=$HOME/.kshrc' >> ~/.profile
+    fi
+
+	set +x
+	if ! grep "^$(id -un)" /etc/passwd | grep /usr/local/bin/oksh ; then
+		printf "Change shell to oksh? [y]es/[n]o: "
+		read -r resp
+		if [ "$resp" = "y" ] ; then
+			chsh -s /usr/local/bin/oksh
+		fi
+	fi
+	set -x
+
+
+fi
+
+if [ "$FONTS" = yes ] ; then
+	if ! [ -d ~/.fonts ]; then
+		git clone https://git.riedstra.dev/mitch/fonts ~/.fonts
+	fi
+fi
+
+if [ "$RIVER" = yes ] ; then
+	if ! [ -d "$rivercfgdir" ] ; then
+		git clone https://git.riedstra.dev/wl/rivercfg "$rivercfgdir"
+	fi
+	cd "$rivercfgdir"
+	sudo pacman -S river foot swaylock waybar wlr-randr bemenu bemenu-wayland swaybg grim slurp
+	./link.sh
+	cd -
+
+	wlcustomdir="$rivercfgdir"/../wlcustom
+	if ! [ -d "$wlcustomdir" ] ; then
+		git clone https://git.riedstra.dev/wl/wlcustom "$wlcustomdir"
+	fi
+	cd "$wlcustomdir"
+	sudo make install
+	cd -
+fi
+
+if [ "$DPW" = yes ] ; then
+	if ! [ -d "$dpwdir" ] ; then
+		git clone https://git.riedstra.dev/mitch/dpw "$dpwdir"
+	fi
+	cd "$dpwdir"
+	make PREFIX="$HOME" install
+	cd -
+fi
+
+if [ "$YAY" = yes ] ; then
+	if ! [ -d "$yaydir" ] ; then
+		git clone https://aur.archlinux.org/yay.git "$yaydir"
+	fi
+	cd "$yaydir"
+	yay --version || makepkg -si
+	cd -
+fi
+
+if [ "$BRAVE" = yes ] ;then
+if [ "$YAY" == yes ] ; then
+	yay -Sy brave-bin
+else
+	echo "You need to install yay ( env YAY=yes ./distro/arch.sh or so )"
+	echo "In order to install brave via this script"
+fi
+fi
+
+
+if [ "$DWM" = yes ] ; then
+	sudo pacman -S picom
+
+	if ! [ -d "$dwmdir" ] ; then
+		git clone https://git.riedstra.dev/x/dwm "$dwmdir"
+	fi
+	cd "$dwmdir"
+	make
+	sudo make clean install
+	cd -
+
+	if ! [ -d "$dwmStdir" ] ; then
+		git clone https://git.riedstra.dev/x/st "$dwmStdir"
+	fi
+	cd "$dwmStdir"
+	make
+	sudo make clean install
+	cd -
+
+	if ! [ -d "$dwmDmenudir" ] ; then
+		git clone https://git.riedstra.dev/x/dmenu "$dwmDmenudir"
+	fi
+	cd "$dwmDmenudir"
+	make
+	sudo make clean install
+	cd -
+
+	if ! [ -d "$dwmSesdir" ] ; then
+		git clone https://git.riedstra.dev/x/session "$dwmSesdir"
+	fi
+	cd "$dwmSesdir"
+	sudo make install
+	cd -
+
+	if ! [ -f ~/.xinitrc ] ; then
+cat > ~/.xinitrc <<EOF
+export ENV=\$HOME/.kshrc
+export SSH_ASKPASS=dmenu_askpass
+xsetroot -grey &
+xset r rate 300 50 &
+dwm
 EOF
+	chmod +x ~/.xinitrc
+	fi
+
+fi
 
 
+if [ "$GRAPHICS" = yes ] ; then
 case $(lspci | grep VGA) in
 	*Intel*)
 		# OpenCL Drivers
@@ -169,7 +337,12 @@ case $(lspci | grep VGA) in
 		pacman -S --needed rocm-opencl-runtime
 	;;
 	*Nvidia*)
+		echo "Note older GPUs need 'nvidia' and/or 'nvidia-lts' instead of nvidia-open"
+		pacman -S --needed nvidia-open nvidia-open-lts nvidia-utils opencl-nvidia
 	;;
     *)
 		echo "No GPU detected"
 esac
+fi
+
+echo "You may wish to run systemctl enable sddm if you haven't already"