Bin: fix installation script issues

bin/format-drives.sh

@@ -3,6 +3,11 @@
 
 set -e
 
+if [ "$(id -u)" != "0" ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
 # Configuration parameters
 ask_root_password=false	# Whether to prompt for a root user password
 boot_partition="" # The drive to install the bootloader to
@@ -19,34 +24,36 @@ function usage() {
 	exit 2
 }
 
+# Argument processing logic shamelessly stolen from https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash
+POSITIONAL_ARGS=()
 while [[ $# -gt 0 ]]; do
   case "$1" in
-      --ask-root-password|-a)
+	--ask-root-password|-a)
-			ask_root_password=true
+		ask_root_password=true
-			shift
+		shift
-			;;
+		;;
-	  --boot|-b)
+	--boot|-b)
-		   boot_partition=$1
+		boot_partition="$2"
-			shift
+		shift
-			;;
+		shift
-		--luks|-l)
+		;;
-			luks_partition=1
+	--luks|-l)
-			shift
+		luks_partition="$2"
-			;;
+		shift
-		--help|-h)
+		shift
-			usage
+		;;
-			shift
+	--help|-h)
-			;;
+		usage
-		*)
+		shift
-			break
+		;;
-			;;
+	*)
+		POSITIONAL_ARGS+=("$1") # save positional arg
+      	shift # past argument
+		;;
 	esac
 done
 
-if [ "$(id -u)" != "0" ]; then
+set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
-   echo "This script must be run as root" 1>&2
-   exit 1
-fi
 
 cryptsetup --label=nixos-crypt --type=luks2 luksFormat $luks_partition
 cryptsetup luksOpen $luks_partition nixos-crypt

modules/apps/media.nix

@@ -15,9 +15,7 @@ in
         "app.drey.EarTag"
         "com.calibre_ebook.calibre"
         "com.github.unrud.VideoDownloader"
-        "org.feichtmeier.Musicpod"
         "io.freetubeapp.FreeTube"
-        "io.github.dweymouth.supersonic"
         "org.kde.krita"
         "org.kde.KStyle.Adwaita//5.15-23.08" # Retrieved from https://docs.flatpak.org/en/latest/desktop-integration.html
         "org.kde.KStyle.Adwaita//6.6"