work on packages

in-chroot.fish

@@ -21,6 +21,8 @@ echo "LANG=en_US.UTF-8" >/etc/locale.conf
 # TODO edit the mkinitcpio file because the default probably isn't correct
 # then run the command to regenerate
 
+set -l services
+set -l user_services
 begin
 	set -l packages
 
@@ -35,26 +37,31 @@ begin
 	set -a packages gparted
 	# networking
 	set -a packages networkmanager dnsmasq
+	set -a services NetworkManager
 	set -a packages firewalld # this is literally the only program with network zones, it sucks
+	set -a services firewalld
 	# man
 	set -a packages man-db man-pages texinfo tealdeer
 	# boot
 	set -a packages grub
 	# fonts
-	set -a packages noto-fonts ttf-croscore ttf-carlito ttf-dejavu cantarell-fonts ttf-roboto otf-atkinson-hyperlegible ttf-fira-sans ttf-fira-mono wqy-zenhei
+	set -a packages noto-fonts-extra ttf-croscore ttf-carlito ttf-dejavu cantarell-fonts ttf-roboto otf-atkinson-hyperlegible ttf-fira-sans ttf-fira-mono wqy-zenhei
 
 	# filesystem stuff
 	set -a packages gvfs-mtp gvfs-smb gvfs-gphoto2
 	set -a packages p7zip # everything else is already installed or unneeded
 
 	set -a packages chrony
+	set -a services chronyd
 	set -a packages fzf ripgrep-all neofetch
 	# audio
 	set -a packages pipewire-audio pipewire-alsa pipewire-jack pipewire-pulse lib32-pipewire lib32-pipewire-jack wireplumber
 	set -a packages rtkit realtime-privileges
 	set -a packages fluidsynth soundfont-fluid
+	set -a user_services fluidsynth
 	# bluetooth
 	set -a packages bluez bluez-utils blueman
+	set -a services bluetooth
 
 	# wayland
 	set -a packages xorg-xwayland xorg-xhost xorg-xeyes
@@ -63,6 +70,7 @@ begin
 	# display manager
 	if true
 		set -a packages weston sddm
+		set -a services sddm
 	end
 
 	# desktop
@@ -85,13 +93,23 @@ begin
 		set -a packages breeze-icons
 	end
 
+	# thermal
+	if true
+		set -a packages tlp
+		set -a services tlp
+		if lscpu | grep -q GenuineIntel
+			set -a packages thermald
+			set -a services thermald
+		end
+	end
+
 	# basic user utilities
 	set -a packages libreoffice-fresh krita inkscape blender keepassxc mpv qbittorrent ffmpeg yt-dlp krdc
 
 
 	# development
 	# TODO
-	if true
+	if false
 		set -a packages mosh rsync sshfs
 		set -a packages pnpm
 		set -a packages rustup mold
@@ -109,7 +127,7 @@ begin
 	#set -a packages os-prober
 
 
-	# cpu
+	# ucode
 	if lscpu | grep -q GenuineIntel
 		set -a packages intel-ucode
 	end
@@ -129,8 +147,8 @@ begin
 	pacman -Fy --noconfirm
 end
 
-ln -sf /bin/doas /bin/sudo
-ln -sf /bin/doasedit /bin/sudoedit
+#ln -sf /bin/doas /bin/sudo
+#ln -sf /bin/doasedit /bin/sudoedit
 
 # grub
 switch (cat /sys/firmware/efi/fw_platform_size)
@@ -145,15 +163,19 @@ switch (cat /sys/firmware/efi/fw_platform_size)
 		grub-install --target=i386-pc $device
 end
 
-# TODO nvidia kernel parameter
+# TODO nvidia kernel parameter (unless nvk is good enough)
 sed -i "
 	s/\\\$RESUME\\\$/"(
-		if test (count $swapdevice) -gt 0
-			echo " resume=$swapdevice[1]" # TODO pick hibernate device
-		end
+		# TODO hibernate?
+		#if test (count $swapdevice) -gt 0
+		#	echo " resume=$swapdevice[1]" # TODO pick hibernate device
+		#end
 	)"/
 " /etc/default/grub
 
+# disable hibernate
+systemctl mask hibernate.target hybrid-sleep.target
+
 grub-mkconfig -o /boot/grub/grub.cfg
 
 
@@ -202,18 +224,16 @@ begin
 		set -a packages ventoy-bin
 	end
 
-	runuser $user --session-command "paru -Syu --sudoloop=true --noconfirm $(string join ' ' $packages)"
+	runuser $user --session-command "paru -Syu --noconfirm $(string join ' ' $packages)"
 end
 
 runuser $user --session-command "tldr -u"
 
 
 # services
-systemctl enable NetworkManager bluetooth firewalld chronyd fstrim.timer sddm
-runuser $user --session-command "systemctl --user enable fluidsynth"
+systemctl enable $services fstrim.timer
+runuser $user --session-command "systemctl --user enable $user_services"
 # TODO check that user pipewire is already enabled
 # TODO configure fluidsynth so that it actually works
 
-# thermald? upower? tlp?
-
 # TODO configure fluidsynth

main.fish

@@ -109,7 +109,8 @@ begin
 	set -l script (mktemp -p /mnt/root)
 	cat common.fish in-chroot.fish > $script
 	arch-chroot /mnt /bin/fish (echo $script | sed "s/\\/mnt//")
-	rm $script 
+	rm $script
+	# TODO check that chroot script ran correctly
 end
 
 echo "finished! you can reboot and start using your system now"