fix random merge i didnt do
This commit is contained in:
parent
ac119bf409
commit
4420558e4d
|
|
@ -105,7 +105,7 @@ linux /vmlinuz-linux
|
||||||
initrd /initramfs-linux.img
|
initrd /initramfs-linux.img
|
||||||
options root=LABEL=ROOT rw rootflags=subvol=@
|
options root=LABEL=ROOT rw rootflags=subvol=@
|
||||||
EOF
|
EOF
|
||||||
cp -R ~/$SCRIPTHOME /mnt/root/
|
cp -R ~/$PROJECTNAME /mnt/root/
|
||||||
cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
|
cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
echo "--------------------------------------"
|
echo "--------------------------------------"
|
||||||
|
|
|
||||||
11
1-setup.sh
11
1-setup.sh
|
|
@ -264,6 +264,11 @@ elif lspci | grep -E "Integrated Graphics Controller"; then
|
||||||
pacman -S libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils --needed --noconfirm
|
pacman -S libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils --needed --noconfirm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#
|
||||||
|
# create a swapfile
|
||||||
|
# $ required for completion of scripts on lower end systems (under 8GB ram will need swap)
|
||||||
|
#
|
||||||
|
|
||||||
SWAPSIZEgb=2
|
SWAPSIZEgb=2
|
||||||
|
|
||||||
SWAPSIZEmb=$((1024*$SWAPSIZEgb))
|
SWAPSIZEmb=$((1024*$SWAPSIZEgb))
|
||||||
|
|
@ -281,14 +286,14 @@ echo -e "Swap /swapfile created and configured wtih $SWAPSIZEgb GB\n"
|
||||||
echo -e "\nDone!\n"
|
echo -e "\nDone!\n"
|
||||||
if ! source install.conf; then
|
if ! source install.conf; then
|
||||||
read -p "Please enter username:" username
|
read -p "Please enter username:" username
|
||||||
echo "username=$username" >> ${HOME}/$SCRIPTHOME/install.conf
|
echo "username=$username" >> ${HOME}/$PROJECTNAME/install.conf
|
||||||
fi
|
fi
|
||||||
if [ $(whoami) = "root" ];
|
if [ $(whoami) = "root" ];
|
||||||
then
|
then
|
||||||
useradd -m -G wheel,libvirt -s /bin/bash $username
|
useradd -m -G wheel,libvirt -s /bin/bash $username
|
||||||
passwd $username
|
passwd $username
|
||||||
cp -R /root/$SCRIPTHOME /home/$username/
|
cp -R /root/$PROJECTNAME /home/$username/
|
||||||
chown -R $username: /home/$username/$SCRIPTHOME
|
chown -R $username: /home/$username/$PROJECTNAME
|
||||||
else
|
else
|
||||||
echo "You are already a user proceed with aur installs"
|
echo "You are already a user proceed with aur installs"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -54,9 +54,9 @@ for PKG in "${PKGS[@]}"; do
|
||||||
done
|
done
|
||||||
|
|
||||||
export PATH=$PATH:~/.local/bin
|
export PATH=$PATH:~/.local/bin
|
||||||
cp -r $HOME/$SCRIPTHOME/dotfiles/* $HOME/.config/
|
cp -r $HOME/$PROJECTNAME/dotfiles/* $HOME/.config/
|
||||||
pip install konsave
|
pip install konsave
|
||||||
konsave -i $HOME/$SCRIPTHOME/kde.knsv
|
konsave -i $HOME/$PROJECTNAME/kde.knsv
|
||||||
sleep 1
|
sleep 1
|
||||||
konsave -a kde
|
konsave -a kde
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,3 +42,11 @@ echo "
|
||||||
sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
|
sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
|
||||||
# Add sudo rights
|
# Add sudo rights
|
||||||
sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
|
sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
|
||||||
|
|
||||||
|
# Replace in the same state
|
||||||
|
cd $pwd
|
||||||
|
echo "
|
||||||
|
###############################################################################
|
||||||
|
# Done - Please Eject Install Media and Reboot
|
||||||
|
###############################################################################
|
||||||
|
"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
PROJECTNAME="ArchNikus"
|
||||||
|
|
||||||
|
bash 0-preinstall.sh
|
||||||
|
arch-chroot /mnt /root/$PROJECTNAME/1-setup.sh
|
||||||
|
source /mnt/root/$PROJECTNAME/install.conf
|
||||||
|
arch-chroot /mnt /usr/bin/runuser -u $username -- /home/$username/$PROJECTNAME/2-user.sh
|
||||||
|
arch-chroot /mnt /root/$PROJECTNAME/3-post-setup.sh
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Find the name of the folder the scripts are in
|
# Find the name of the folder the scripts are in
|
||||||
|
|
||||||
# X! Still erroring out, doesnt get the directory no matter what.
|
|
||||||
# I hate it
|
|
||||||
|
|
||||||
export SCRIPTHOME="$(basename -- $PWD)"
|
export SCRIPTHOME="$(basename -- $PWD)"
|
||||||
echo "Scripts are in dir named $SCRIPTHOME"
|
echo "Scripts are in dir named $SCRIPTHOME"
|
||||||
cd $PWD
|
cd $PWD
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
cp -r $HOME/.config/kitty $HOME/$SCRIPTHOME/dotfiles/kitty
|
cp -r $HOME/.config/kitty $HOME/$PROJECTNAME/dotfiles/kitty
|
||||||
konsave -s kde
|
konsave -s kde
|
||||||
konsave -e kde
|
konsave -e kde
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export PATH=$PATH:~/.local/bin
|
export PATH=$PATH:~/.local/bin
|
||||||
cp -r $HOME/$SCRIPTHOME/dotfiles/* $HOME/.config/
|
cp -r $HOME/$PROJECTNAME/dotfiles/* $HOME/.config/
|
||||||
pip install konsave
|
pip install konsave
|
||||||
konsave -i $HOME/$SCRIPTHOME/kde.knsv
|
konsave -i $HOME/$PROJECTNAME/kde.knsv
|
||||||
sleep 1
|
sleep 1
|
||||||
konsave -a kde
|
konsave -a kde
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue