Alex 2022-07-10 23:14:32 -05:00
commit f801f0e6b4
2 changed files with 21 additions and 12 deletions

View File

@ -25,10 +25,11 @@ enable_repos() {
sudo pacman -Sy sudo pacman -Sy
#commenting since this is done during archinstall
#enable multilib #enable multilib
sudo sh -c "echo "[multilib]" >> /etc/pacman.conf" #sudo sh -c "echo "[multilib]" >> /etc/pacman.conf"
sudo sh -c "echo "Include\ =\ /etc/pacman.d/mirrorlist" >> /etc/pacman.conf" #sudo sh -c "echo "Include\ =\ /etc/pacman.d/mirrorlist" >> /etc/pacman.conf"
sudo sh -c "echo "" >> /etc/pacman.conf" #sudo sh -c "echo "" >> /etc/pacman.conf"
sudo pacman -Sy sudo pacman -Sy
@ -157,7 +158,9 @@ configure() {
read input read input
if [ "$input" = "y" ]; then if [ "$input" = "y" ]; then
echo "permit persist $USER as root" >> ~/.cache/doas.conf echo "permit persist $USER as root" > ~/.cache/doas.conf
echo "permit nopass :wheel as root cmd /sbin/poweroff" >> ~/.cache/doas.conf
echo "permit nopass :wheel as root cmd /sbin/reboot" >> ~/.cache/doas.conf
sudo cp ~/.cache/doas.conf /etc/doas.conf sudo cp ~/.cache/doas.conf /etc/doas.conf
rm ~/.cache/doas.conf rm ~/.cache/doas.conf
doas pacman -R sudo && doas ln -s /bin/doas /bin/sudo #TODO ARCH SPECIFIC doas pacman -R sudo && doas ln -s /bin/doas /bin/sudo #TODO ARCH SPECIFIC
@ -215,8 +218,8 @@ base() {
#install all packages in $PKGS #install all packages in $PKGS
sudo pacman --noconfirm --needed -S - < ./pkgs/base.list sudo pacman --noconfirm --needed -S - < ./pkgs/base.list
#installl all packages in $AUR_PKGS #install all packages in $AUR_PKGS
yay --noconfirm --needed -S - < ./pkgs/aur.list yay --needed -S - < ./pkgs/aur.list
#setup local git repos defined in $GIT_REPOS to $GIT_REPOS_DIR #setup local git repos defined in $GIT_REPOS to $GIT_REPOS_DIR
sh ~/.local/scripts/install.sh add-repos ./pkgs/repos.list sh ~/.local/scripts/install.sh add-repos ./pkgs/repos.list

View File

@ -10,6 +10,7 @@
repo_check() { repo_check() {
if [ -z "$(grep "^\[multilib" /etc/pacman.conf)" ] || if [ -z "$(grep "^\[multilib" /etc/pacman.conf)" ] ||
[ -z "$(grep "^\[community" /etc/pacman.conf)" ] || [ -z "$(grep "^\[community" /etc/pacman.conf)" ] ||
echo "repo check"
[ ! -f "/usr/bin/yay" ]; then [ ! -f "/usr/bin/yay" ]; then
echo "either yay, or the lib32 or community repos have not been setup correctly. Exiting" echo "either yay, or the lib32 or community repos have not been setup correctly. Exiting"
exit exit
@ -19,17 +20,22 @@ repo_check() {
ungoogled_chromium() { ungoogled_chromium() {
repo_check repo_check
echo "after repo check"
CMD=" --noconfirm -S " CMD=" -S "
[ "$1" = "-R" ] && CMD=" -Rs " [ "$1" = "-R" ] && CMD=" -Rs "
#sudo pacman "$CMD" ffmpeg4.4 echo "ungoogled chromium install not working just installing chromium (press enter to continue)"
sudo pacman "$CMD" aur/ungoogled-chromium-binary read input
sudo pacman "$CMD" aur/chromium-ublock-origin
yay "$CMD" aur/chromium-extension-web-store sudo pacman -S chromium
yay "$CMD" aur/chromium-widevine
#yay "$CMD" aur/ungoogled-chromium-binary
#yay "$CMD" aur/chromium-ublock-origin
#yay "$CMD" aur/chromium-extension-web-store
#yay "$CMD" aur/chromium-widevine
} }
virt_manager() { virt_manager() {