From 4afee9658c85762d31f29fc8522670a0361e7233 Mon Sep 17 00:00:00 2001 From: Blake Romero Date: Wed, 1 Apr 2026 04:23:54 +0100 Subject: Remove old options & tidy comments --- config | 21 ++++++--------------- install.sh | 16 ++++++---------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/config b/config index 4280f29..d2ca516 100644 --- a/config +++ b/config @@ -1,8 +1,6 @@ -# -*- mode: shell-script; -*- -# ====================================================== +# # Configuration Options -# ====================================================== -# see README for more info +# # Drive (e.g: /dev/sda, /dev/nvme0n1) drive="/dev/DRIVE" @@ -17,32 +15,25 @@ swap_size=auto # Boot size (e.g: 256M, 512M, 1G) boot_size=1G -# System +# User user=blake - -# Note that some groups provided are required when using seatd and -# may vary depending on your use-case; see the ArchWiki for info: -# https://wiki.archlinux.org/title/Users_and_groups#Group_list user_groups=wheel,video,audio,input,log # System name hostname=artix -# timezones are available in the /usr/share/zoneinfo/ directory +# Timezones are available at '/usr/share/zoneinfo/' timezone=Europe/London -# locales are available at /etc/locale.gen +# Locales are available at '/etc/locale.gen' locale=en_GB # Login autologin=false #greeter=greetd +# Encryption encrypt=true -# Arch -arch_support=false -enable_aur=false - # Extra packages extrapkgs=false diff --git a/install.sh b/install.sh index 57a3651..257a6b5 100755 --- a/install.sh +++ b/install.sh @@ -70,10 +70,8 @@ drive_bytes=$(blockdev --getsize64 "${drive}") drive_size="$(bc <<< "${drive_bytes} / 1000000000")G" # Get a list of options -[[ $encrypt == true ]] && options+="encrypt " -[[ $arch_support == true ]] && options+="arch_support " -[[ $enable_aur == true ]] && options+="enable_aur " -[[ $autologin == true ]] && options+="autologin " +[[ $encrypt == true ]] && config_options+="encrypt " +[[ $autologin == true ]] && config_options+="autologin " echo " ================ CONFIRM INSTALLATION ================ @@ -82,14 +80,14 @@ BOOT Partition: ${boot}, Size: ${boot_size} ROOT Partition: ${root}, Size: MAX SWAP Size: ${swap_size} ------------------------------------------------------" -if [[ $options != "" ]]; then - echo "Options: ${options} +if [[ $config_options != "" ]]; then + echo "Options: ${config_options} ------------------------------------------------------" fi echo "CAUTION: ALL data from ${drive} will be erased !!! ------------------------------------------------------" -echo "Are you sure you want install?" +echo "Are you sure you want continue?" unset input read -rp "Type YES (in uppercase letters) to begin installation: " input [[ "${input}" != "YES" ]] && exit @@ -128,10 +126,8 @@ if [[ $encrypt == true ]]; then root="/dev/mapper/cryptroot" fi -# Make BOOT filesystem +# Make filesystem mkfs.fat -n BOOT -F 32 "${boot}" - -# Make BTRFS ROOT filesystem mkfs.btrfs -qfL ROOT "${root}" # Mount btrfs ROOT drive -- cgit