move computers/cain/fish/void-{quick,repo} to fish/

computers/cain/fish/void-repo

@@ -1,6 +0,0 @@
-# vim: syntax=fish:
-
-function xrupdate -d "Sign and upload voidlinux package repository"
-	xbps-rindex --privkey $_agw_secret_void_privkey --sign-pkg "$XBPS_HOSTDIR"/binpkgs/*.xbps
-	rsync -azvh --progress "$XBPS_HOSTDIR"/binpkgs/* "$_agw_secret_void_copy_dir"
-end

fish/void-repo

@@ -0,0 +1,22 @@
+# vim: syntax=fish:
+
+function xrreload -d "Reload all packages into the package repository"
+	xbps-rindex -f --add "$XBPS_HOSTDIR"/binpkgs/*.xbps
+end
+
+function xrsync -d "Upload voidlinux package repository"
+	rsync $argv -azvh --delete --progress \
+		"$XBPS_HOSTDIR"/binpkgs/ \
+		"$_agw_secret_void_copy_dir"
+end
+
+function xrupdate -d "Sign and upload voidlinux package repository"
+	xrreload
+	xbps-rindex --privkey  "$_agw_secret_void_privkey" \
+	            --sign-pkg "$XBPS_HOSTDIR"/binpkgs/*.xbps
+	xrsync --dry-run
+	echo "continue? [yes/no]"
+	if test (read) = "yes"
+		xrsync
+	end
+end

system/grub

@@ -1,8 +1,8 @@
 # GRUB boot loader configuration
 
-GRUB_DEFAULT=0
+GRUB_DEFAULT=saved
 GRUB_TIMEOUT=0
-GRUB_DISTRIBUTOR="Arch"
+GRUB_DISTRIBUTOR="ProjectGolan"
 GRUB_CMDLINE_LINUX_DEFAULT="quiet"
 GRUB_CMDLINE_LINUX=""
 GRUB_PRELOAD_MODULES="part_gpt part_msdos"
@@ -13,6 +13,5 @@ GRUB_PRELOAD_MODULES="part_gpt part_msdos"
 GRUB_GFXPAYLOAD_LINUX=text
 #GRUB_DISABLE_LINUX_UUID=true
 #GRUB_DISABLE_RECOVERY=true
-GRUB_THEME="/usr/share/grub/themes/breeze/theme.txt"
 #GRUB_INIT_TUNE="480 440 1"
 GRUB_SAVEDEFAULT="true"

virtual-machines/MacEmu/common

@@ -1,13 +1,12 @@
 bootdrive 0
 bootdriver 0
 dsp /dev/dsp
-ether enp1s0
+ether slirp
 extfs /media/store/vm/MacEmu/Share
 frameskip 1
 ignoresegv false
 jit true
 keyboardtype 5
-keycodefile /usr/share/BasiliskII/keycodes
 keycodes true
 mixer /dev/mixer
 mousewheellines 3

virtual-machines/MacEmu/common-m68k

@@ -7,6 +7,7 @@ jitdebug false
 jitfpu true
 jitinline true
 jitlazyflush true
+keycodefile /usr/share/BasiliskII/keycodes
 modelid 5
 ramsize 67108864
 rom /media/store/osmedia/Apple MacOS/ROMs OldWorld/512KB ROMs/1989-09 - 368CADFE - Mac IIci.ROM

virtual-machines/MacEmu/common-ppc

@@ -2,6 +2,7 @@ gfxaccel true
 idlewait true
 ignoreillegal false
 jit68k false
+keycodefile /usr/share/SheepShaver/keycodes
 ramsize 1073741824
 rom /media/store/osmedia/Apple MacOS/ROMs NewWorld/1999-05-14 - Mac OS ROM 1.6.rom
 screenmodes 0