fixed merge conflicts
This commit is contained in:
commit
7659c4198c
4 changed files with 58 additions and 15 deletions
21
installer.sh
21
installer.sh
|
@ -4,6 +4,12 @@ dotfiles="https://git.amolinae.com/amolinae06/dotfiles.git"
|
|||
software="https://git.amolinae.com/amolinae06/installer/raw/branch/main/software.csv"
|
||||
devware="https://git.amolinae.com/amolinae06/installer/raw/branch/main/devware.csv"
|
||||
|
||||
update_alpine(){
|
||||
printf "Updating alpine indexes.\n"
|
||||
apk update && apk upgrade
|
||||
printf "Updated successfully.\n"
|
||||
}
|
||||
|
||||
apk_install(){
|
||||
echo "installing $1"; doas apk add "$1" >/dev/null 2>&1
|
||||
}
|
||||
|
@ -18,6 +24,7 @@ git_install(){
|
|||
}
|
||||
|
||||
read_software(){
|
||||
[ -d "$HOME/.local/src/" ] || mkdir -p "$HOME/.local/src/"
|
||||
([ -f "$1" ] && cp "$1" /tmp/temp.csv) || wget -qO- "$1" > /tmp/temp.csv
|
||||
|
||||
tail -n +2 "/tmp/temp.csv" | sed -E ':a; s/("[^"]*),([^"]*")/\1\2/; ta' | while IFS=',' read -r NAME DESCRIPTION GIT GIT_URL; do
|
||||
|
@ -43,7 +50,7 @@ setup_greetd(){
|
|||
vt = 7
|
||||
|
||||
[default_session]
|
||||
command = "agreety -t -r --cmd /home/$USER/.local/bin/dwllaunch"
|
||||
command = "agreety --cmd /home/$USER/.local/bin/dwllaunch"
|
||||
user = "greetd"
|
||||
EOF
|
||||
|
||||
|
@ -70,7 +77,8 @@ setup_home(){
|
|||
git clone --recursive $dotfiles
|
||||
cd dotfiles
|
||||
rm -rf .git .gitmodules
|
||||
cp -r .cache .config .local .zprofile $HOME
|
||||
cp -r .cache .config .zprofile $HOME
|
||||
cp -r .local/* $HOME/.local/
|
||||
cd $HOME
|
||||
rm -rf dotfiles/
|
||||
xdg-user-dirs-update
|
||||
|
@ -81,7 +89,7 @@ setup_home(){
|
|||
|
||||
setup_chroot(){
|
||||
printf "Setting up chroot\n"
|
||||
apk_install curl
|
||||
doas apk add curl
|
||||
cd $HOME/Documents/Miscellaneous
|
||||
mkdir alpchroot
|
||||
curl -LO https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/apk-tools-static-2.14.4-r1.apk
|
||||
|
@ -92,6 +100,7 @@ setup_chroot(){
|
|||
mkdir -p alpchroot/etc/apk
|
||||
doas cp /etc/apk/repositories alpchroot/etc/apk/repositories
|
||||
doas apk del curl
|
||||
rm -rf sbin/ .PKGINFO .SIGN.RSA.alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub apk-tools-static-2.14.4-r1.apk
|
||||
printf "Finished setting up chroot!\n"
|
||||
}
|
||||
|
||||
|
@ -100,10 +109,12 @@ compile() {
|
|||
bwroot make clean install
|
||||
}
|
||||
|
||||
compile "dwl"
|
||||
echo "Welcome to the installer"
|
||||
update_alpine
|
||||
doas apk add git
|
||||
get_user
|
||||
read_software "$software"
|
||||
setup-wayland-base
|
||||
setup_home
|
||||
setup_greetd
|
||||
setup_shell
|
||||
|
@ -114,3 +125,5 @@ compile dwl
|
|||
compile slstatus
|
||||
compile hellwal
|
||||
compile ctpv
|
||||
doas apk del git
|
||||
printf "Installation finished, before you reboot please install packages you need (e.g nvidia/amd drivers)\n"; exit 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue