arm-rpi4: Clean use/arm-rpi4/x11

features.in/arm-rpi4/config.mk

@@ -16,12 +16,10 @@ endif
 	@$(call add,THE_PACKAGES,firmware-bcm4345)
 	@$(call add,THE_PACKAGES,brcm-patchram-plus)
 	@$(call add,THE_PACKAGES,rpi4-resize-rootpart)
-	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd attach-bluetooth)
 	@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd-wait-online)
 
-use/arm-rpi4/x11: use/arm-rpi4 \
-	use/browser/firefox use/browser/firefox/esr
-	@$(call add,THE_PACKAGES,celluloid celluloid-csd-disabled)
+use/arm-rpi4/x11: use/arm-rpi4
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd attach-bluetooth)
 
 use/arm-rpi4/kernel: use/arm-rpi4
 ifeq (aarch64,$(ARCH))

features.in/arm-rpi4/image-scripts.d/80-chromium-to-firefox-in-panel

-#!/bin/sh -efu
-
-fffile="/usr/share/applications/firefox.desktop"
-panfile="/etc/skel/.config/xfce4/panel/launcher-5/15592088901.desktop"
-
-if [ -f "$fffile" -a -f "$panfile" ]
-then
-	sed -i 's/Chromium/Firefox/' "$panfile"
-	sed -i 's/chromium/firefox/' "$panfile"
-fi

features.in/arm-rpi4/image-scripts.d/81-mplayer-to-celluloid-in-mimeapps

-#!/bin/sh -efu
-# Change the default application for all file types from mplayer to celluloid
-
-cfile="/usr/share/applications/io.github.celluloid_player.Celluloid.desktop"
-mimeappsfile="/usr/share/applications/mimeapps.list"
-mimeappslocalfile="/etc/skel/.config/mimeapps.list"
-
-if [ -f "$cfile" -a -f "$mimeappsfile" ]
-then
-echo "[Default Applications]" > "$mimeappslocalfile"
-sed '/[=;]mplayer.desktop/!d ; /[=;]mplayer.desktop/s/=.*/=io.github.celluloid_player.Celluloid.desktop;/' "$mimeappsfile" >> "$mimeappslocalfile"
-echo "" >> "$mimeappslocalfile"
-echo "[Added Associations]" >> "$mimeappslocalfile"
-sed '/[=;]mplayer.desktop/!d ; /[=;]mplayer.desktop/s/=.*/=io.github.celluloid_player.Celluloid.desktop;/' "$mimeappsfile" >> "$mimeappslocalfile"
-fi