diff --git a/README.md b/README.md index 9fd63b8..7eeeaf1 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,11 @@ You need to have an Alpine Linux installation with at least one user. To run thi wget https://git.amolinae.com/amolinae06/installer/raw/branch/main/installer.sh && doas sh installer.sh ``` -It will prompt for a username, you'll need to input the user you want the dotfiles, chroot, and shell setup installed to. (e.g. amolinae, leon, etc.) +It will prompt for a username, you'll need to input the user you want the dotfiles, chroot, and shell setup installed to (e.g. amolinae, leon, etc.). -The whole installation shouldn't take more than `6 minutes`. After it finishes it is time to make a few extra setup steps such as installing nvidia drivers or amd drivers. +Aditionally, the software that requires to be compiled will be done after the post-install script gets called, this is because most of these require to be logged in as the user. + +The whole installation shouldn't take more than `6 minutes`, in my case both installation attempts took around 4 to 5 minutes. After it finishes it is time to make a few extra setup steps such as installing nvidia drivers or amd drivers which should be mandatory if you have the hardware. ## TODO - [X] Read `software.csv` @@ -35,4 +37,6 @@ The whole installation shouldn't take more than `6 minutes`. After it finishes i - [X] Compile git software on chroot. - [ ] Cleanup files. - [ ] Auto reboot. -- [ ] Make the scripts look prettier. \ No newline at end of file +- [ ] Error handling. +- [ ] Make the scripts look prettier. +- [ ] Add to my domain (amolinae.com) for easier retrieval. diff --git a/installer.sh b/installer.sh index 15cfd8f..7921334 100644 --- a/installer.sh +++ b/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" postinstall="https://git.amolinae.com/amolinae06/installer/raw/branch/main/postinstall.sh" +update_alpine(){ + printf "Updating alpine indexes.\n" + apk update && apk upgrade + printf "Updated successdully.\n" +} + apk_install(){ echo "installing $1"; apk add "$1" >/dev/null 2>&1 } @@ -46,7 +52,7 @@ setup_greetd(){ vt = 7 [default_session] -command = "tuigreet -t -r --cmd /home/$user/.local/bin/dwllaunch" +command = "agreety -t -r --cmd /home/$user/.local/bin/dwllaunch" user = "greetd" EOF @@ -88,6 +94,7 @@ setup_chroot(){ mkdir -p alpchroot/etc/apk cp /etc/apk/repositories alpchroot/etc/apk/repositories 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" } @@ -110,6 +117,7 @@ get_user(){ check_root echo "Welcome to the installer" +update_alpine apk_install git get_user read_software "$software" @@ -122,4 +130,4 @@ setup_shell setup_bluetooth setup_chroot post_install "$user" -printf "Installation finished, before you reboot please install packages you need (e.g nvidia/amd drivers) \n"; exit 0 +printf "Installation finished, before you reboot please install packages you need (e.g nvidia/amd drivers)\n"; exit 0 diff --git a/software.csv b/software.csv index 93c6a84..0fc10fb 100644 --- a/software.csv +++ b/software.csv @@ -12,7 +12,7 @@ fuzzel,"Application launcher for wlroots-based Wayland compositors",N, git,"Distributed version control system",N, gnome-keyring,"GNOME keyring",N, greetd,"Minimal and flexible login manager daemon",N, -greetd-tuigreet,"Graphical console greeter for greetd",N, +greetd-agreety,"Simple, text-based greeter",N, grim,"Grabs images from Wayland compositors",N, imv-wayland,"Image viewer for Wayland",N, kanshi,"Dynamic display configuration for Wayland",N,