diff --git a/etc/calamares/modules/bootloader.conf b/etc/calamares/modules/bootloader.conf new file mode 100644 index 0000000..b335dfa --- /dev/null +++ b/etc/calamares/modules/bootloader.conf @@ -0,0 +1,76 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Bootloader configuration. The bootloader is installed to allow +# the system to start (and pick one of the installed operating +# systems to run). +# +# Take note that Debian-derivatives that use unmodified GRUB EFI packages +# should specifically set *efiBootloaderId* to "debian" because that is +# hard-coded in `grubx64.efi`. +--- +# A variable from global storage which overrides the value of efiBootLoader +#efiBootLoaderVar: "packagechooser_bootloader" + +# Define which bootloader you want to use for EFI installations +# 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 +kernelSearchPath: "/usr/lib/modules" +kernelName: "vmlinuz" +timeout: "10" + +# systemd-boot and refind support custom kernel params +kernelParams: [ "quiet" ] + +# A list of kernel names that refind should accept as kernels +#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. +# +grubInstall: "grub-install" +grubMkconfig: "grub-mkconfig" +grubCfg: "/boot/grub/grub.cfg" +grubProbe: "grub-probe" +efiBootMgr: "efibootmgr" + +# 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: true diff --git a/etc/calamares/modules/displaymanager.conf b/etc/calamares/modules/displaymanager.conf new file mode 100644 index 0000000..8f8e9c7 --- /dev/null +++ b/etc/calamares/modules/displaymanager.conf @@ -0,0 +1,28 @@ +# Configure one or more display managers (e.g. SDDM) +# with a "best effort" approach. +--- +#The DM module attempts to set up all the DMs found in this list, in that precise order. +#It also sets up autologin, if the feature is enabled in globalstorage. +#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. +displaymanagers: + - slim + - sddm + - lightdm + - gdm + - mdm + - lxdm + - kdm + +#Enable the following settings to force a desktop environment in your displaymanager configuration file: +#defaultDesktopEnvironment: +# executable: "startkde" +# desktopFile: "plasma" + +#If true, try to ensure that the user, group, /var directory etc. for the +#display manager are set up correctly. This is normally done by the distribution +#packages, and best left to them. Therefore, it is disabled by default. +basicSetup: false + +#If true, setup autologin for openSUSE. This only makes sense on openSUSE +#derivatives or other systems where /etc/sysconfig/displaymanager exists. +sysconfigSetup: false diff --git a/etc/calamares/modules/localeq.conf b/etc/calamares/modules/localeq.conf index 4f18c96..647f8c6 100644 --- a/etc/calamares/modules/localeq.conf +++ b/etc/calamares/modules/localeq.conf @@ -44,7 +44,7 @@ useSystemTimezone: true # or set the *style* key to an unsupported format (e.g. `none`). # Also, note the analogous feature in src/modules/welcome/welcome.conf. # -geoip: - style: "json" - url: "https://geoip.kde.org/v1/calamares" - selector: "time_zone" +#geoip: +# style: "json" +# url: "https://geoip.kde.org/v1/calamares" +# selector: "time_zone" diff --git a/etc/calamares/modules/packages.conf b/etc/calamares/modules/packages.conf index 435054c..d466334 100644 --- a/etc/calamares/modules/packages.conf +++ b/etc/calamares/modules/packages.conf @@ -16,6 +16,8 @@ needed_only: false operations: - try_remove: - calamares + - calamares-parch + - calamares-parch-beta - parchlinux-cala-config - kconfig - kcoreaddons @@ -52,7 +54,6 @@ operations: - diffutils - dmraid - dnsmasq - - dosfstools - e2fsprogs - edk2-shell - espeakup @@ -114,7 +115,6 @@ operations: - tcpdump - testdisk - tpm2-tss - - udftools - usb_modeswitch - usbmuxd - usbutils diff --git a/etc/calamares/modules/shellprocess-alg-mkinitcpio.conf b/etc/calamares/modules/shellprocess-parch-mkinitcpio.conf similarity index 100% rename from etc/calamares/modules/shellprocess-alg-mkinitcpio.conf rename to etc/calamares/modules/shellprocess-parch-mkinitcpio.conf diff --git a/etc/calamares/modules/shellprocess-parch-systemd.conf b/etc/calamares/modules/shellprocess-parch-systemd.conf new file mode 100644 index 0000000..2bde483 --- /dev/null +++ b/etc/calamares/modules/shellprocess-parch-systemd.conf @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the shell process job. + +--- +dontChroot: false +timeout: 10 +script: + - "-systemctl enable bluetooth" + - "-rm -rf /etc/sddm.conf.d/autologin.conf" + diff --git a/etc/calamares/modules/usersq.conf b/etc/calamares/modules/usersq.conf index c394ae5..44beb0b 100644 --- a/etc/calamares/modules/usersq.conf +++ b/etc/calamares/modules/usersq.conf @@ -19,8 +19,8 @@ defaultGroups: passwordRequirements: nonempty: true - minLength: 0 - maxLength: 0 + minLength: 3 + maxLength: 10 libpwquality: - minlen: 8 diff --git a/etc/calamares/modules/welcomeq.conf b/etc/calamares/modules/welcomeq.conf index 6dc00f7..0bcd2fe 100644 --- a/etc/calamares/modules/welcomeq.conf +++ b/etc/calamares/modules/welcomeq.conf @@ -21,7 +21,7 @@ showDonateUrl: https://daramet.com/parchlinux requirements: requiredStorage: 10.26 requiredRam: 1.00 - internetCheckUrl: https://parchlinux.ir + internetCheckUrl: https://parchlinux.com check: - storage diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf index 0ed79b2..03e36e8 100644 --- a/etc/calamares/settings.conf +++ b/etc/calamares/settings.conf @@ -7,20 +7,23 @@ modules-search: [ local ] instances: -- id: algmkinitcpio +- id: parchmkinitcpio module: shellprocess - config: shellprocess-alg-mkinitcpio.conf + config: shellprocess-parch-mkinitcpio.conf +- id: parchsystemd + module: shellprocess + config: shellprocess-parch-systemd.conf - id: remove-livecd module: shellprocess config: shellprocess-remove-livecd.conf sequence: - show: - - welcomeq - - localeq - - keyboardq + - welcome + - locale + - keyboard - partition - - usersq + - users - summary - exec: - partition @@ -28,17 +31,18 @@ sequence: - unpackfs - machineid - fstab - - localeq - - keyboardq + - locale + - keyboard - localecfg - luksbootkeyfile - luksopenswaphookcfg - - shellprocess@algmkinitcpio + - shellprocess@parchmkinitcpio - initcpiocfg - initcpio - removeuser - - usersq + - users - displaymanager + - shellprocess@parchsystemd - networkcfg - hwclock - services-systemd