1
0
Fork 0

Compare commits

..

No commits in common. "7f3f8f1ba00d65973febedf67b22e657c89a52c0" and "dc76c64c7c281a5ff8259a9c9aada5a30da1258c" have entirely different histories.

2 changed files with 25 additions and 30 deletions

View file

@ -3,11 +3,6 @@
set -e set -e
if [ "$(id -u)" != "0" ]; then
echo "This script must be run as root" 1>&2
exit 1
fi
# Configuration parameters # Configuration parameters
ask_root_password=false # Whether to prompt for a root user password ask_root_password=false # Whether to prompt for a root user password
boot_partition="" # The drive to install the bootloader to boot_partition="" # The drive to install the bootloader to
@ -24,8 +19,6 @@ function usage() {
exit 2 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 while [[ $# -gt 0 ]]; do
case "$1" in case "$1" in
--ask-root-password|-a) --ask-root-password|-a)
@ -33,13 +26,11 @@ while [[ $# -gt 0 ]]; do
shift shift
;; ;;
--boot|-b) --boot|-b)
boot_partition="$2" boot_partition=$1
shift
shift shift
;; ;;
--luks|-l) --luks|-l)
luks_partition="$2" luks_partition=1
shift
shift shift
;; ;;
--help|-h) --help|-h)
@ -47,13 +38,15 @@ while [[ $# -gt 0 ]]; do
shift shift
;; ;;
*) *)
POSITIONAL_ARGS+=("$1") # save positional arg break
shift # past argument
;; ;;
esac esac
done done
set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters if [ "$(id -u)" != "0" ]; then
echo "This script must be run as root" 1>&2
exit 1
fi
cryptsetup --label=nixos-crypt --type=luks2 luksFormat $luks_partition cryptsetup --label=nixos-crypt --type=luks2 luksFormat $luks_partition
cryptsetup luksOpen $luks_partition nixos-crypt cryptsetup luksOpen $luks_partition nixos-crypt

View file

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