diff --git a/etc/calamares/modules/bootloader.conf b/etc/calamares/modules/bootloader.conf index fe80754..cedcc7c 100644 --- a/etc/calamares/modules/bootloader.conf +++ b/etc/calamares/modules/bootloader.conf @@ -1,58 +1,24 @@ -#efiBootLoaderVar: "packagechooser_bootloader" # Possible options are 'grub', 'sb-shim' and 'systemd-boot'. -efiBootLoader: "grub" -# systemd-boot configuration files settings, set kernel search path, kernel name -# and amount of time before default selection boots +efiBootLoader: "systemd-boot" + kernelSearchPath: "/usr/lib/modules" -kernelName: "vmlinuz" +#kernelName: "vmlinuz" +kernelPattern: "^vmlinuz.*" timeout: "10" # systemd-boot and refind support custom kernel params -kernelParams: [ "quiet" ] -#refindKernelList: [ "linux","linux-lts","linux-zen","linux-hardened" ] -# GRUB 2 binary names and boot directory -# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. -# These names are also used when using sb-shim, since that needs some -# GRUB functionality (notably grub-probe) to work. As needed, you may use -# complete paths like `/usr/bin/efibootmgr` for the executables. -# +kernelParams: [ "nvme_load=YES","nowatchdog","quiet" ] +refindKernelList: [ "linux","linux-lts","linux-zen","linux-hardened" ] grubInstall: "grub-install" grubMkconfig: "grub-mkconfig" grubCfg: "/boot/grub/grub.cfg" grubProbe: "grub-probe" efiBootMgr: "efibootmgr" +efiBootloaderId: "parchlinux" -# Optionally set the bootloader ID to use for EFI. This is passed to -# grub-install --bootloader-id. -# -# If not set here, the value from bootloaderEntryName from branding.desc -# is used, with problematic characters (space and slash) replaced. -# -# The ID is also used as a directory name within the EFI environment, -# and the bootloader is copied from /boot/efi/EFI// . When -# setting the option here, keep in mind that the name is sanitized -# (problematic characters, see above, are replaced). -# -# There are some special words possible at the end of *efiBootloaderId*: -# ${SERIAL} can be used to obtain a uniquely-numbered suffix -# that is added to the Id (yielding, e.g., `dirname1` or `dirname72`) -# ${RANDOM} can be used to obtain a unique 4-digit hex suffix -# ${PHRASE} can be used to obtain a unique 1-to-3-word suffix -# from a dictionary of space-themed words -# These words must be at the **end** of the *efiBootloaderId* value. -# There must also be at most one of them. If there is none, no suffix- -# processing is done and the *efiBootloaderId* is used unchanged. -# -# NOTE: Debian derivatives that use the unmodified Debian GRUB EFI -# packages may need to set this to "debian" because that is -# hard-coded in `grubx64.efi`. -# -# efiBootloaderId: "dirname" - -# Optionally install a copy of the GRUB EFI bootloader as the EFI -# fallback loader (either bootia32.efi or bootx64.efi depending on -# the system). This may be needed on certain systems (Intel DH87MC -# seems to be the only one). If you set this to false, take care -# to add another module to optionally install the fallback on those -# boards that need it. installEFIFallback: false + +loaderEntries: + - "timeout 5" + - "console-mode auto" + - "reboot-for-bitlocker 1" \ No newline at end of file diff --git a/etc/calamares/modules/mount.conf b/etc/calamares/modules/mount.conf index 56938a7..5722380 100644 --- a/etc/calamares/modules/mount.conf +++ b/etc/calamares/modules/mount.conf @@ -5,6 +5,8 @@ # target as a usable chroot / "live" system). --- +setSELinux: false + extraMounts: - device: proc fs: proc @@ -40,10 +42,10 @@ btrfsSubvolumes: mountOptions: - filesystem: default - options: [ defaults, noatime ] + options: [ noatime ] - filesystem: efi - options: [ defaults, umask=0077 ] + options: [ fmask=0137, dmask=0027 ] - filesystem: btrfs - options: [ defaults, noatime, compress=zstd ] + options: [ noatime, compress=zstd ] - filesystem: btrfs_swap - options: [ defaults, noatime ] + options: [ noatime ] \ No newline at end of file diff --git a/etc/calamares/modules/partition.conf b/etc/calamares/modules/partition.conf index 3b868e0..b0081fe 100644 --- a/etc/calamares/modules/partition.conf +++ b/etc/calamares/modules/partition.conf @@ -3,11 +3,15 @@ # # partition handling. --- +efi: + mountPoint: "/efi" + recommendedSize: 1024MiB + minimumSize: 500MiB + label: "EFI" -efiSystemPartition: "/boot/efi" # set to 512M for best compatinbility for buggy old EFI firmware -efiSystemPartitionSize: 512M +#efiSystemPartitionSize: 512M userSwapChoices: - none # Create no swap, use no swap @@ -15,6 +19,7 @@ userSwapChoices: - suspend # At least main memory size - file # To swap file instead of partition + drawNestedPartitions: false alwaysShowPartitionLabels: true @@ -25,19 +30,10 @@ initialSwapChoice: none defaultFileSystemType: "ext4" -# Selectable filesystem type, used when "erase" is done. -# -# When erasing the disk, the *defaultFileSystemType* is used (see -# above), but it is also possible to give users a choice: -# list suitable filesystems here. A drop-down is provided -# to pick which is the filesystems will be used. -# -# The value *defaultFileSystemType* is added to this list (with a warning) -# if not present; the default pick is the *defaultFileSystemType*. -# -# If not specified at all, uses *defaultFileSystemType* without a -# warning (this matches traditional no-choice-available behavior best). -# availableFileSystemTypes: ["ext4","btrfs","xfs","f2fs"] +showNotEncryptedBootMessage: false + +luksGeneration: luks1 + availableFileSystemTypes: ["ext4","f2fs","xfs","btrfs"] diff --git a/etc/calamares/modules/users.conf b/etc/calamares/modules/users.conf index 90fc4c9..5a9820e 100644 --- a/etc/calamares/modules/users.conf +++ b/etc/calamares/modules/users.conf @@ -20,7 +20,6 @@ sudoersGroup: wheel autologinGroup: autologin - sudoersConfigureWithGroup: true setRootPassword: false @@ -32,11 +31,11 @@ doAutologin: false # These are very weak -- actually, none at all -- requirements passwordRequirements: - minLength: -1 # Password at least this many characters - maxLength: 10 # Password at most this many characters - libpwquality: - - minlen=0 - - minclass=0 + minLength: 1 # Password at least this many characters +# maxLength: 10 # Password at most this many characters +# libpwquality: +# - minlen=0 +# - minclass=0 allowWeakPasswords: true @@ -49,7 +48,6 @@ user: hostname: location: EtcFile writeHostsFile: true - template: "ParchBox-${cpu}" forbidden_names: [ localhost ] presets: