Merge branch 'main' of disroot:bean-co-official/horse-arch

in-chroot.fish

@@ -1,4 +1,3 @@
-echo "LANG=en_US.UTF-8" > /etc/locale.conf
 echo "choose a hostname (name for the computer, other computers may see it on networks)"
 ask horse-arch-(cat /dev/urandom | base32 -w 8 | head -n 1) > /etc/hostname
 
@@ -14,6 +13,7 @@ popd
 hwclock --systohc
 cat /etc/locale.gen | sed "s/^#en_US.UTF-8/en_US.UTF-8/" > /etc/locale.gen
 locale-gen
+echo "LANG=en_US.UTF-8" > /etc/locale.conf
 
 #TODO edit the mkinitcpio file because the default probably isn't correct
 # a command doesn't need to be ran for it because of pacstrap
@@ -22,7 +22,8 @@ begin
 	set -l packages
 
 	# base-devel
-	set -a packages (pacman -Si base-devel | grep "Depends On" | sed "s/^.*://" | sed "s/sudo//g")
+	set -a packages (pacman -Si base-devel | grep "Depends On" | sed "s/^.*://" | string split "  ")
+	set -e packages[(contains -i $packages sudo)]
 	set -a packages opendoas
 	# filesystems
 	set -a packages ntfs-3g dosfstools btrfs-progs exfatprogs
@@ -46,7 +47,7 @@ begin
 	# TODO fonts
 	set -a packages noto-fonts ttf-fira-sans ttf-fira-mono wqy-zenhei
 	# filesystem stuff
-	set -a packages gvfs-mtp gvfs-smb gvfs-ptp p7zip # TODO unrar?
+	set -a packages gvfs-mtp gvfs-smb gvfs-gphoto2 p7zip # TODO unrar?
 	# todo check other things for archiver
 
 	set -a packages chrony
@@ -141,10 +142,9 @@ runuser $user -c 'tldr -u'
 
 
 # enable a bunch of services with systemctl
-systemctl enable bluetooth firewalld chronyd
+systemctl enable bluetooth firewalld chronyd fstrim.timer
 # TODO fluidsynth
 # thermald? upower?
 
-
 # TODO configure fluidsynth
 

main.fish

@@ -101,6 +101,13 @@ begin
 		set -l device (getdevice $words[1])
 		set -l mountpoint $words[3]
 		set -l filesystem $words[5]
+		set -l options defaults
+		if test $filesystem = btrfs
+			# TODO subvol
+			if false
+				set -a options subvol=
+			end
+		end
 		set -l check (
 			switch $path
 				case "/"
@@ -111,7 +118,7 @@ begin
 					echo 0
 			end
 		)
-		echo "$device $mountpoint $filesystem defaults 0 $check" >> /mnt/etc/fstab
+		echo "$device $mountpoint $filesystem $(string join , $options) 0 $check" >> /mnt/etc/fstab
 	end
 	set -l swaplines (swapon --raw --noheadings --show=NAME,PRIO)
 	if test (count $swaplines) -gt 1
@@ -128,12 +135,11 @@ begin
 	for swapline in $swaplines
 		set -l words (string split " " $swapline)
 		set -l device (getdevice $words[1])
-		set -l prio $words[2]
-		if test $prio -ge 0
-			echo "$device none swap defaults,pri=$prio 0 0" >> /mnt/etc/fstab
-		else
-			echo "$device none swap defaults 0 0" >> /mnt/etc/fstab
+		set -l options defaults
+		if test $words[2] -ge 0
+			set -a options pri=$words[2]
 		end
+		echo "$device none swap $(string join , $options) 0 0" >> /mnt/etc/fstab
 	end
 end