artix

commit 78b09ad320181ad92c7c6480e1ba582f5cc997b7
parent cafbf8c57492f9874368135f6142f973f78da675
Author: awy <awy@awy.one>
Date:   Mon, 10 Feb 2025 21:08:36 +0300

runit

Diffstat:
M
install.sh
 | 
12
++++++------
M
post_chroot.sh
 | 
9
++++-----

2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/install.sh b/install.sh
@@ -5,7 +5,7 @@ export green="\033[1;32m"
 export cyan="\033[0;36m"
 export normal="\033[0m"
 
-dinitctl start ntpd
+sv up ntpd
 
 cpuVendorID=$(grep -m 1 'vendor_id' /proc/cpuinfo | awk '{print $3}')
 
@@ -37,8 +37,8 @@ binKernel(){
 	mount /dev/"$boot_drive" /mnt/boot/efi
 	pacman -Sy --confirm
 	case $choosenKernel in
-		1) basestrap /mnt base dinit seatd-dinit linux linux-headers ;;
-		2) basestrap /mnt base dinit seatd-dinit linux-zen linux-zen-headers ;;
+		1) basestrap /mnt base runit elogind-runit linux linux-headers ;;
+		2) basestrap /mnt base runit elogind-runit linux-zen linux-zen-headers ;;
 		*) printf ${red}"Invalid kernel${normal}" && exit 1 ;;
 	esac
 }
@@ -46,7 +46,7 @@ binKernel(){
 customKernel(){
 	mount /dev/"$boot_drive" /mnt/boot
 	pacman -Sy --confirm
-	basestrap /mnt base dinit seatd-dinit udev 
+	basestrap /mnt base runit elogind-runit
 	cp .config /mnt/usr/src
 }
 
@@ -66,13 +66,13 @@ getUserData(){
 	printf "Enter password for %s: " "$username"
 	userpass=$(getPass)
 	echo
-	printf "Enter hostname: " 
+	printf "Enter hostname: "
 	read -r hostname
 	printf ${red}"Choose Linux Kernel:${normal}\n1. Default kernel\n2. Zen kernel\n3. Custom kernel${normal}\nYour choose: "
 	read -r choosenKernel
 	printf "Enter disk label (e.g. sda, nvme0n1p <- p is mandatory in nvme case): "
 	read -r disk_drive
-	printf "Enter space-separated partition numbers (e.g., 5 6 for 5 boot 6 root): " 
+	printf "Enter space-separated partition numbers (e.g., 5 6 for 5 boot 6 root): "
 	read -r partitions
 	root_drive="$disk_drive${partitions##* }"
 	boot_drive="$disk_drive${partitions%% *}"
diff --git a/post_chroot.sh b/post_chroot.sh
@@ -23,7 +23,7 @@ PARTUUID_ROOT=$(blkid -s PARTUUID -o value /dev/"$root_drive")
 
 binKernel(){
 	echo "options hid_apple fnmode=0" > /etc/modprobe.d/hid_apple.conf
-	pacman -S grub os-prober efibootmgr --noconfirm  
+	pacman -S grub os-prober efibootmgr --noconfirm
 	grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=grub
 	sed -i "s#GRUB_CMDLINE_LINUX_DEFAULT=.*#GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet options root=PARTUUID=$PARTUUID_ROOT rw nvidia-drm.modeset=1 modeset=1 fbdev=1 intel_iommu=on\"#g" /etc/default/grub
 	sed -i -e 's/MODULES=()/MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)/g' /etc/mkinitcpio.conf
@@ -45,7 +45,7 @@ customKernel(){
 	mv "linux-$latestKernel" "linux"
 	cd "linux"
 	mv /usr/src/.config .config
-	sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT init=/sbin/dinit-init nvidia_drm.modeset=1 nvidia_drm.fbdev=1\"" .config
+	sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT init=/sbin/runit-init nvidia_drm.modeset=1 nvidia_drm.fbdev=1\"" .config
 	pacman -S bc perl bison make diffutils gcc flex rsync --noconfirm
 	make olddefconfig
 	make menuconfig
@@ -109,9 +109,8 @@ permit nopass keepenv :$username
 permit nopass keepenv :root
 EOL
 
-pacman -S dhcpcd dhcpcd-dinit dbus-dinit --noconfirm
-ln -sf /etc/dinit.d/dhcpcd /etc/dinit.d/boot.d/
-ln -sf /etc/dinit.d/dbus /etc/dinit.d/boot.d/
+pacman -S dhcpcd dhcpcd-runit --noconfirm
+ln -s /etc/runit/sv/dhcpcd /etc/runit/runsvdir/default
 
 pacman -S nvidia-open-dkms nvidia-utils --noconfirm
 pacman -S libva-nvidia-driver --noconfirm