Reduce installer complexity

packages/calamares-extensions/config/modules/finished.conf

@@ -4,19 +4,6 @@
 # Configuration for the "finished" page, which is usually shown only at
 # the end of the installation (successful or not).
 ---
-# DEPRECATED
-#
-# The finished page can hold a "restart system now" checkbox.
-# If this is false, no checkbox is shown and the system is not restarted
-# when Calamares exits.
-# restartNowEnabled: true
-
-# DEPRECATED
-#
-# Initial state of the checkbox "restart now". Only relevant when the
-# checkbox is shown by restartNowEnabled.
-# restartNowChecked: false
-
 # Behavior of the "restart system now" button.
 #
 # There are four usable values:
@@ -34,7 +21,7 @@
 #       This is new behavior.
 #
 # The three combinations of legacy values are still supported.
-restartNowMode: user-unchecked
+restartNowMode: always
 
 # If the checkbox is shown, and the checkbox is checked, then when
 # Calamares exits from the finished-page it will run this command.

packages/calamares-extensions/config/modules/locale.conf

@@ -14,8 +14,8 @@
 # the locale page can be set through keys *region* and *zone*.
 # If either is not set, defaults to America/New_York.
 #
-region:                     "America"
+region:                     "Europe"
-zone:                       "New_York"
+zone:                       "Brussels"
 
 
 # System locales are detected in the following order:

packages/calamares-extensions/config/modules/packagechooser.conf

@@ -1,251 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Configuration for the low-density software chooser
----
-# Software selection mode, to set whether the software packages
-# can be chosen singly, or multiply.
-#
-# Possible modes are "optional", "required" (for zero-or-one or exactly-one)
-# or "optionalmultiple", "requiredmultiple" (for zero-or-more
-# or one-or-more).
-mode: required
-
-# Software installation method:
-#
-# - "legacy" or "custom" or "contextualprocess"
-#   When set to "legacy", writes a GlobalStorage value for the choice that
-#   has been made. The key is *packagechooser_<id>*. The module's
-#   instance name is used; see the *instances* section of `settings.conf`.
-#   If there is just one packagechooser module, and no special instance is set,
-#   resulting GS key is probably *packagechooser_packagechooser*.
-#
-#   The GS value is a comma-separated list of the IDs of the selected
-#   packages, or an empty string if none is selected.
-#
-#   With "legacy" installation, you should have a contextualprocess or similar
-#   module somewhere in the `exec` phase to process the GlobalStorage key
-#   and actually **do** something for the packages.
-#
-# - "packages"
-#   When set to "packages", writes GlobalStorage values suitable for
-#   consumption by the *packages* module (which should appear later
-#   in the `exec` section. These package settings will then be handed
-#   off to whatever package manager is configured there.
-#
-# - "netinstall-select"
-#   When this is set, the id(s) selected are passed to the netinstall module.
-#   Any id that matches a group name in that module is set to checked
-#
-# - "netinstall-add"
-#   With this method, the packagechooser module is used to add groups to the
-#   netinstall module.  For this to hav=e any effect.  You must set netinstall,
-#   which is described below.
-#
-# There is no need to put this module in the `exec` section. There
-# are no jobs that this module provides. You should put **other**
-# modules, either *contextualprocess* or *packages* or some custom
-# module, in the `exec` section to do the actual work.
-method: legacy
-
-
-# Human-visible strings in this module. These are all optional.
-# The following translated keys are used:
-#  - *step*, used in the overall progress view (left-hand pane)
-#
-# Each key can have a [locale] added to it, which is used as
-# the translated string for that locale. For the strings
-# associated with the "no-selection" item, see *items*, below
-# with the explicit item-*id* "".
-#
-labels:
-    step: "Desktop"
-
-# (Optional) item-*id* of pre-selected list-view item.
-# Pre-selects one of the items below.
-default: gnome
-
-# Items to display in the chooser. In general, this should be a
-# pretty short list to avoid overwhelming the UI. This is a list
-# of objects, and the items are displayed in list order.
-#
-# Either provide the data for an item in the list (using the keys
-# below), or use existing AppData XML files, or use AppStream cache
-# as a source for the data.
-#
-# For data provided by the list: the item has an id, which is used in
-# setting the value of *packagechooser_<module-id>*. The following field
-# is mandatory:
-#
-#  - *id*
-#       ID for the product. The ID "" is special, and is used for
-#       "no package selected". Only include this if the mode allows
-#       selecting none. The name and description given for the "no package
-#       selected" item are displayed when the module starts.
-#
-# Each item must adhere to one of three "styles" of item. Which styles
-# are supported depends on compile-time dependencies of Calamares.
-# Both AppData and AppStream may **optionally** be available.
-#
-# # Generic Items #
-#
-# These items are always supported. They require the most configuration
-# **in this file** and duplicate information that may be available elsewhere
-# (e.g. in AppData or AppStream), but do not require any additional
-# dependencies. These items have the following **mandatory** fields:
-#
-#  - *name*
-#       Human-readable name of the product. To provide translations,
-#       add a *[lang]* decoration as part of the key name, e.g. `name[nl]`
-#       for Dutch. The list of usable languages can be found in
-#       `CMakeLists.txt` or as part of the debug output of Calamares.
-#  - *description*
-#       Human-readable description. These can be translated as well.
-#  - *screenshot*
-#       Path to a single screenshot of the product. May be a filesystem
-#       path or a QRC path, e.g. ":/images/no-selection.png". If the path
-#       is not found (e.g. is a non-existent absolute path, or is a relative
-#       path that does not exist in the current working directory) then
-#       an additional attempt is made to load the image from the **branding**
-#       directory.
-#
-# The following fields are **optional** for an item:
-#
-#  - *packages* :
-#       List of package names for the product. If using the *method*
-#       "packages", consider this item mandatory (because otherwise
-#       selecting the item would install no packages).
-#
-#  - *netinstall* :
-#       The data in this field should follow the format of a group
-#       from the netinstall module documented in
-#       src/modules/netinstall/netinstall.conf.  This is only used
-#       when method is set to "netinstall-add"
-#
-# # AppData Items #
-#
-# For data provided by AppData XML: the item has an *appdata*
-# key which points to an AppData XML file in the local filesystem.
-# This file is parsed to provide the id (from AppData id), name
-# (from AppData name), description (from AppData description paragraphs
-# or the summary entries), and a screenshot (the default screenshot
-# from AppData). No package is set (but that is unused anyway).
-#
-# AppData may contain IDs that are not useful inside Calamares,
-# and the screenshot URL may be remote -- a remote URL will not
-# be loaded and the screenshot will be missing. An item with *appdata*
-# **may** specify an ID or screenshot path, as above. This will override
-# the settings from AppData.
-#
-# # AppStream Items #
-#
-# For data provided by AppStream cache: the item has an *appstream*
-# key which matches the AppStream identifier in the cache (e.g.
-# *org.kde.kwrite.desktop*). Data is retrieved from the AppStream
-# cache for that ID. The package name is set from the AppStream data.
-#
-# An item for AppStream may also contain an *id* and a *screenshot*
-# key which will override the data from AppStream.
-items:
-
-    - id: gnome
-      packages: [ gnome ]
-      name: GNOME
-      description: "<html>Every part of GNOME has been designed to make it simple and easy to use. It provides a focused working environment that helps you get things done. GNOME is a popular choice and well tested on NixOS.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://www.gnome.org/\">gnome.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/gnome.png"
-
-    - id: plasma6
-      packages: [ plasma6 ]
-      name: Plasma
-      description: "<html>Plasma is made to stay out of the way as it helps you get things done. But under its light and intuitive surface, it's a highly customizable. So you're free to choose ways of usage right as you need them and when you need them. Plasma is a popular choice and well tested on NixOS.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://kde.org/plasma-desktop/\">kde.org/plasma-desktop</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/plasma6.png"
-
-    - id: plasma5
-      packages: [ plasma5 ]
-      name: Plasma 5
-      description: "<html>A long term support version of Plasma. More mature than Plasma 6 currently, but less actively developed.<br/>
-                    <br/>
-                    </html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/plasma5.png"
-
-    - id: xfce
-      packages: [ xfce ]
-      name: Xfce
-      description: "<html>Xfce is a lightweight desktop environment. It aims to be fast and low on system resources, while still being visually appealing and user friendly.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://www.xfce.org/\">xfce.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/xfce.png"
-
-    - id: pantheon
-      packages: [ pantheon ]
-      name: Pantheon
-      description: "<html>Pantheon is the default desktop of Elementary OS. It provides a productive and intuitive user experience while also being visually appealing.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://elementary.io/docs/learning-the-basics\">elementary.io/docs/learning-the-basics</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/pantheon.png"
-
-    - id: cinnamon
-      packages: [ cinnamon ]
-      name: Cinnamon
-      description: "<html>Cinnamon is a desktop which provides advanced innovative features and a traditional user experience. The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://projects.linuxmint.com/cinnamon/\">projects.linuxmint.com/cinnamon</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/cinnamon.png"
-
-    - id: mate
-      packages: [ mate ]
-      name: MATE
-      description: "<html>The MATE Desktop Environment is the continuation of GNOME 2. It provides an intuitive and attractive desktop environment.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://mate-desktop.org/\">mate-desktop.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/mate.png"
-
-    - id: enlightenment
-      packages: [ enlightenment ]
-      name: Enlightenment
-      description: "<html>Enlightenment is a Window Manager, Compositor and Minimal Desktop. Enlightenment is classed as a desktop shell as it provides everything you need to operate your desktop or laptop, but it is not a full application suite.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://www.enlightenment.org/\">enlightenment.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/enlightenment.png"
-
-    - id: lxqt
-      packages: [ lxqt ]
-      name: LXQt
-      description: "<html>LXQt is a lightweight Qt desktop environment. It will not get in your way. It will not hang or slow down your system. It is focused on being a classic desktop with a modern look and feel.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://lxqt-project.org/\">lxqt-project.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/lxqt.png"
-
-    # Lumina is not yet stable enough, once it is, simply uncommenting the lines below is all that's needed to enable it as an option
-    #- id: lumina
-    #  packages: [ lumina ]
-    #  name: Lumina
-    #  description: "<html>Lumina is designed to have a small footprint, giving your system the best performance possible. It is built to flow seamlessly between computer tasks and offers several integrated utilities in one convenient package.<br/>
-    #                - Learn more at <a href=\"https://lumina-desktop.org/\">lumina-desktop.org</a></html>"
-    #  screenshot: "/run/current-system/sw/share/calamares/images/lumina.png"
-
-    - id: budgie
-      packages: [ budgie ]
-      name: Budgie
-      description: "<html>The Budgie Desktop is a feature-rich, modern desktop designed to keep out the way of the user.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://docs.buddiesofbudgie.org/\">buddiesofbudgie.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/budgie.png"
-
-    - id: deepin
-      packages: [ deepin ]
-      name: Deepin
-      description: "<html>The Deepin Desktop Environment is an elegant, easy to use and reliable desktop environment.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://www.deepin.org/\">deepin.org</a></html>"
-      screenshot: "/run/current-system/sw/share/calamares/images/deepin.png"
-
-    - id: ""
-      packages: []
-      name: "No desktop"
-      screenshot: "/run/current-system/sw/share/calamares/images/nodesktop.png"
-      description: "A minimal system without a graphical user interface will be installed. This is great for servers or custom setups with window managers. The configuration can be changed after installation."

packages/calamares-extensions/config/modules/partition.conf

@@ -34,18 +34,8 @@
 efi:
     mountPoint:         "/boot"
     recommendedSize:    512MiB
-    minimumSize:        32MiB
     label:              "EFI"
 
-# Deprecated alias of efi.mountPoint
-# efiSystemPartition:     "/boot/efi"
-
-# Deprecated alias of efi.recommendedSize
-# efiSystemPartitionSize:          300MiB
-
-# Deprecated alias of efi.label
-# efiSystemPartitionName:     EFI
-
 # In autogenerated partitioning, allow the user to select a swap size?
 # If there is exactly one choice, no UI is presented, and the user
 # cannot make a choice -- this setting is used. If there is more than
@@ -72,21 +62,13 @@ efi:
 # as well (later in the exec phase) so that the swap file is
 # actually created.
 userSwapChoices:
-    - none      # Create no swap, use no swap
-    - small     # Up to 4GB
     - suspend   # At least main memory size
-    # - reuse     # Re-use existing swap, but don't create any (unsupported right now)
-    # - file      # To swap file instead of partition
 
 # This optional setting specifies the name of the swap partition (see
 # PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
 # If nothing is specified, the partition name is left unset.
 # swapPartitionName:      swap
 
-# LEGACY SETTINGS (these will generate a warning)
-# ensureSuspendToDisk:    true
-# neverCreateSwap:        false
-
 # This setting specifies the LUKS generation (i.e LUKS1, LUKS2) used internally by
 # cryptsetup when creating an encrypted partition.
 #
@@ -101,16 +83,6 @@ userSwapChoices:
 #
 luksGeneration: luks2
 
-# This setting determines if encryption should be allowed when using zfs.  This
-# setting has no effect unless zfs support is provided.
-#
-# This setting is to handle the fact that some bootloaders(such as grub) do not
-# support zfs encryption.
-#
-# The default is true
-#
-# allowZfsEncryption: true
-
 # Correctly draw nested (e.g. logical) partitions as such.
 drawNestedPartitions:   false
 
@@ -125,16 +97,7 @@ alwaysShowPartitionLabels: true
 # the user to modify.
 #
 # If nothing is specified, manual partitioning is enabled.
-#allowManualPartitioning:   true
+allowManualPartitioning:   false
-
-# Show not encrypted boot partition warning.
-#
-# When set to false, this option does not show the
-# "Boot partition not encrypted" warning when encrypting the
-# root partition but not /boot partition.
-#
-# If nothing is specified, the warning is shown.
-showNotEncryptedBootMessage:   false
 
 # Initial selection on the Choice page
 #
@@ -146,7 +109,7 @@ showNotEncryptedBootMessage:   false
 #
 # The default is "none"
 #
-initialPartitioningChoice: none
+initialPartitioningChoice: erase
 #
 # Similarly, some of the installation choices may offer a choice of swap;
 # the available choices depend on *userSwapChoices*, above, and this
@@ -154,28 +117,7 @@ initialPartitioningChoice: none
 #
 # The default is "none" (no swap) if that is one of the enabled options, otherwise
 # one of the items from the options.
-initialSwapChoice: none
+initialSwapChoice: suspend
-
-# armInstall
-#
-# Leaves 16MB empty at the start of a drive when partitioning
-# where usually the u-boot loader goes
-#
-# armInstall: false
-
-# Default partition table type, used when a "erase" disk is made.
-#
-# When erasing a disk, a new partition table is created on disk.
-# In other cases, e.g. Replace and Alongside, as well as when using
-# manual partitioning, this partition table exists already on disk
-# and it is left unmodified.
-#
-# Suggested values: gpt, msdos
-# If nothing is specified, Calamares defaults to "gpt" if system is
-# efi or "msdos".
-#
-# Names are case-sensitive and defined by KPMCore.
-# defaultPartitionTableType: msdos
 
 # Requirement for partition table type
 #
@@ -186,59 +128,7 @@ initialSwapChoice: none
 #
 # If nothing is specified, Calamares defaults to both "msdos" and "gpt".
 #
-# requiredPartitionTableType: gpt
+requiredPartitionTableType: gpt
-# requiredPartitionTableType:
-#     - msdos
-#     - gpt
-
-# Default filesystem type, used when a "new" partition is made.
-#
-# When replacing a partition, the new filesystem type will be from the 
-# defaultFileSystemType value. In other cases, e.g. Erase and Alongside,
-# as well as when using manual partitioning and creating a new
-# partition, this filesystem type is pre-selected. Note that
-# editing a partition in manual-creation mode will not automatically
-# change the filesystem type to this default value -- it is not
-# creating a new partition.
-#
-# Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
-# If nothing is specified, Calamares defaults to "ext4".
-#
-# Names are case-sensitive and defined by KPMCore.
-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","f2fs"]
-
-# Show/hide LUKS related functionality in automated partitioning modes.
-# Disable this if you choose not to deploy early unlocking support in GRUB2
-# and/or your distribution's initramfs solution.
-#
-# BIG FAT WARNING:
-#
-# This option is unsupported, as it cuts out a crucial security feature.
-# Disabling LUKS and shipping Calamares without a correctly configured GRUB2
-# and initramfs is considered suboptimal use of the Calamares software. The
-# Calamares team will not provide user support for any potential issue that
-# may arise as a consequence of setting this option to false.
-# It is strongly recommended that system integrators put in the work to support
-# LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc.
-# For more information on setting up GRUB2 for Calamares with LUKS, see
-# https://github.com/calamares/calamares/wiki/Deploy-LUKS
-#
-# If nothing is specified, LUKS is enabled in automated modes.
-#enableLuksAutomatedPartitioning:    true
 
 # Partition layout.
 #
@@ -260,41 +150,6 @@ partitionLayout:
       mountPoint: "/"
       size: 100%
 
-#
+enableLuksAutomatedPartitioning: true
-# There can be any number of partitions, each entry having the following attributes:
+# FIXME(m): This does not seem to work
-#   - name: filesystem label
+preCheckEncryption: true
-#           and
-#           partition name (gpt only; since KPMCore 4.2.0)
-#   - uuid: partition uuid (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - filesystem: filesystem type (optional parameter)
-#       - if not set at all, treat as "unformatted"
-#       - if "unformatted", no filesystem will be created
-#       - if "unknown" (or an unknown FS name, like "elephant") then the
-#         default filesystem type, or the user's choice, will be applied instead
-#         of "unknown" (e.g. the user might pick ext4, or xfs).
-#   - noEncrypt: whether this partition is exempt from encryption if enabled (optional parameter; default is false)
-#   - mountPoint: partition mount point (optional parameter; not mounted if unset)
-#   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
-#           or
-#           % of the available drive space if a '%' is appended to the value
-#   - minSize: minimum partition size (optional parameter)
-#   - maxSize: maximum partition size (optional parameter)
-#   - features: filesystem features (optional parameter; requires KPMCore >= 4.2.0)
-#       name: boolean or integer or string
-
-# Checking for available storage
-#
-# This overlaps with the setting of the same name in the welcome module's
-# requirements section. If nothing is set by the welcome module, this
-# value is used instead. It is still a problem if there is no required
-# size set at all, and the replace and resize options will not be offered
-# if no required size is set.
-#
-# The value is in Gibibytes (GiB).
-#
-# BIG FAT WARNING: except for OEM-phase-0 use, you should be using
-#                  the welcome module, **and** configure this value in
-#                  `welcome.conf`, not here.
-# requiredStorage: 3.5

packages/calamares-extensions/config/modules/unfree.conf

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
----
-qmlLabel:
-    label: "Unfree Software"
-method: legacy
-mode: required
-labels:
-    step: "Unfree Software"
-packageChoice: free

packages/calamares-extensions/config/modules/users.conf

@@ -39,48 +39,15 @@ defaultGroups:
     - networkmanager
     - wheel
 
-# When *sudoersGroup* is set to a non-empty string, Calamares creates a
-# sudoers file for the user. This file is located at:
-#     `/etc/sudoers.d/10-installer`
-# Remember to add the (value of) *sudoersGroup* to *defaultGroups*.
-#
-# If your Distribution already sets up a group of sudoers in its packaging,
-# remove this setting (delete or comment out the line below). Otherwise,
-# the setting will be duplicated in the `/etc/sudoers.d/10-installer` file,
-# potentially confusing users.
-# sudoersGroup:    wheel
-
-# Some Distributions require a 'autologin' group for the user.
-# Autologin causes a user to become automatically logged in to
-# the desktop environment on boot.
-# Disable when your Distribution does not require such a group.
-# autologinGroup:  autologin
-
-
 ### ROOT AND SUDO
 #
 # Some distributions have a root user enabled for login. Others
 # rely entirely on sudo or similar mechanisms to raise privileges.
 
-# If set to `false` (the default), writes a sudoers file with `ALL=(ALL)`
-# so that commands can be run as any user. If set to `true`, writes
-# `ALL=(ALL:ALL)` so that any user and any group can be chosen.
-# sudoersConfigureWithGroup: false
-
 # Setting this to false, causes the root account to be disabled.
 # When disabled, hides the "Use the same password for administrator"
 # checkbox. Also hides the "Choose a password" and associated text-inputs.
-setRootPassword: true
+setRootPassword: false
-
-# You can control the initial state for the 'reuse password for root'
-# checkbox here. Possible values are:
-#  - true to check or
-#  - false to uncheck
-#
-# When checked, the user password is used for the root account too.
-#
-# NOTE: *doReusePassword* requires *setRootPassword* to be enabled.
-doReusePassword: false
 
 
 ### PASSWORDS AND LOGIN
@@ -98,94 +65,7 @@ doReusePassword: false
 #  - true to check or
 #  - false to uncheck
 # These set the **initial** state of the checkbox.
-doAutologin:     false
+doAutologin:     true
-
-# These are optional password-requirements that a distro can enforce
-# on the user. The values given in this sample file set only very weak
-# validation settings.
-#
-# Calamares itself supports two checks:
-#   - minLength
-#   - maxLength
-# In this sample file, the values are set to -1 which means "no
-# minimum", "no maximum". This allows any password at all.
-# No effort is done to ensure that the checks are consistent
-# (e.g. specifying a maximum length less than the minimum length
-# will annoy users).
-#
-# Calamares supports password checking through libpwquality.
-# The libpwquality check relies on the (optional) libpwquality library.
-# The value for libpwquality is a list of configuration statements like
-# those found in pwquality.conf. The statements are handed off to the
-# libpwquality parser for evaluation. The check is ignored if
-# libpwquality is not available at build time (generates a warning in
-# the log). The Calamares password check rejects passwords with a
-# score of < 40 with the given libpwquality settings.
-#
-# (additional checks may be implemented in CheckPWQuality.cpp and
-# wired into UsersPage.cpp)
-#
-# To disable all password validations:
-#  - comment out the relevant 'passwordRequirements' keys below,
-#    or set minLength and maxLength to -1.
-#  - disable libpwquality at build-time.
-# To allow all passwords, but provide warnings:
-#  - set both 'allowWeakPasswords' and 'allowWeakPasswordsDefault' to true.
-#    (That will show the box *Allow weak passwords* in the user-
-#    interface, and check it by default).
-#  - configure password-checking however you wish.
-# To require specific password characteristics:
-#  - set 'allowWeakPasswords' to false (the default)
-#  - configure password-checking, e.g. with NIST settings
-
-
-# These are very weak -- actually, none at all -- requirements
-passwordRequirements:
-    minLength: 1  # Password at least this many characters
-    maxLength: -1  # Password at most this many characters
-    libpwquality:
-        - minlen=0
-        - minclass=0
-
-# These are "you must have a password, any password" -- requirements
-#
-# passwordRequirements:
-#     minLength: 1
-
-# These are requirements the try to follow the suggestions from
-#     https://pages.nist.gov/800-63-3/sp800-63b.html , "Digital Identity Guidelines".
-# Note that requiring long and complex passwords has its own cost,
-# because the user has to come up with one at install time.
-# Setting 'allowWeakPasswords' to false and 'doAutologin' to false
-# will require a strong password and prevent (graphical) login
-# without the password. It is likely to be annoying for casual users.
-#
-# passwordRequirements:
-#     minLength: 8
-#     maxLength: 64
-#     libpwquality:
-#         - minlen=8
-#         - maxrepeat=3
-#         - maxsequence=3
-#         - usersubstr=4
-#         - badwords=linux
-
-# You can control the visibility of the 'strong passwords' checkbox here.
-# Possible values are:
-#  - true to show or
-#  - false to hide  (default)
-# the checkbox. This checkbox allows the user to choose to disable
-# password-strength-checks. By default the box is **hidden**, so
-# that you have to pick a password that satisfies the checks.
-allowWeakPasswords: true
-# You can control the initial state for the 'strong passwords' checkbox here.
-# Possible values are:
-#  - true to uncheck or
-#  - false to check (default)
-# the checkbox by default. Since the box is labeled to enforce strong
-# passwords, in order to **allow** weak ones by default, the box needs
-# to be unchecked.
-allowWeakPasswordsDefault: false
 
 
 # User settings
@@ -252,7 +132,7 @@ user:
 #   always contains "localhost", but may list others that are unsuitable
 #   or broken in special ways.
 hostname:
-  location: None
+  location: Transient
   writeHostsFile: false
   forbidden_names: [ localhost ]
 

packages/calamares-extensions/config/modules/welcome.conf

@@ -20,10 +20,8 @@
 # The setting can also be a full URL which will then be used
 # instead of the one from the branding file.
 showSupportUrl:         true
-showKnownIssuesUrl:     true
+showKnownIssuesUrl:     false
-showReleaseNotesUrl:    true
+showReleaseNotesUrl:    false
-# TODO:3.3 Move to branding, keep only a bool here
-# showDonateUrl:          https://kde.org/community/donations/
 
 # Requirements checking. These are general, generic, things
 # that are checked. They may not match with the actual requirements
@@ -32,32 +30,17 @@ requirements:
     # Amount of available disk, in GiB. Floating-point is allowed here.
     # Note that this does not account for *usable* disk, so it is possible
     # to satisfy this requirement, yet have no space to install to.
-    requiredStorage:    10
+    requiredStorage:    64
 
     # Amount of available RAM, in GiB. Floating-point is allowed here.
-    requiredRam:        1.0
+    requiredRam:        4.0
 
     # To check for internet connectivity, Calamares does a HTTP GET
     # on this URL; on success (e.g. HTTP code 200) internet is OK.
     # Use a privacy-respecting URL here, preferably in your distro's domain.
     #
     # The URL is only used if "internet" is in the *check* list below.
-    internetCheckUrl: [ https://geoip.kde.org/v1/calamares, https://cache.nixos.org/ ]
+    internetCheckUrl: [ https://nixup.io, https://cache.nixos.org/ ]
-    #
-    # This may be a single URL, or a list or URLs, in which case the
-    # URLs will be checked one-by-one; if any of them returns data,
-    # internet is assumed to be OK. This can be used to check via
-    # a number of places, where some domains may be down or blocked.
-    #
-    # To use a list of URLs, just use YAML list syntax (e.g.
-    #
-    # internetCheckUrl:
-    #     - http://www.kde.org
-    #     - http://www.freebsd.org
-    #
-    # or short-form
-    #
-    # internetCheckUrl: [ http://www.kde.org, http://www.freebsd.org ]
 
     # List conditions to check. Each listed condition will be
     # probed in some way, and yields true or false according to

packages/calamares-extensions/config/settings.conf

@@ -34,62 +34,6 @@
 # YAML: list of strings.
 modules-search: [ local, /run/current-system/sw/lib/calamares/modules ]
 
-# Instances section. This section is optional, and it defines custom instances
-# for modules of any kind. An instance entry has these keys:
-# - *module* name, which matches the module name from the module descriptor
-#   (usually the name of the directory under `src/modules/`, but third-
-#   party modules may diverge.
-# - *id* (optional) an identifier to distinguish this instance from
-#   all the others. If none is given, the name of the module is used.
-#   Together, the module and id form an instance key (see below).
-# - *config* (optional) a filename for the configuration. If none is
-#   given, *module*`.conf` is used (e.g. `welcome.conf` for the welcome
-#   module)
-# - *weight* (optional) In the *exec* phase of the sequence, progress
-#   is reported as jobs are completed. The jobs from a single module
-#   together contribute the full weight of that module. The overall
-#   progress (0 .. 100%) is divided up according to the weight of each
-#   module. Give modules that take a lot of time to complete, a larger
-#   weight to keep the overall progress moving along steadily. This
-#   weight overrides a weight given in the module descriptor. If no weight
-#   is given, uses the value from the module descriptor, or 1 if there
-#   isn't one there either.
-#
-# The primary goal of this mechanism is to allow loading multiple instances
-# of the same module, with different configuration. If you don't need this,
-# the instances section can safely be left empty.
-#
-# Module name plus instance name makes an instance key, e.g.
-# "webview@owncloud", where "webview" is the module name (for the webview
-# viewmodule) and "owncloud" is the instance name. In the *sequence*
-# section below, use instance-keys to name instances (instead of just
-# a module name, for modules which have only a single instance).
-#
-# Every module implicitly has an instance with the instance name equal
-# to its module name, e.g. "welcome@welcome". In the *sequence* section,
-# mentioning a module without a full instance key (e.g. "welcome")
-# means that implicit module.
-#
-# An instance may specify its configuration file (e.g. `webview-home.conf`).
-# The implicit instances all have configuration files named `<module>.conf`.
-# This (implict) way matches the source examples, where the welcome
-# module contains an example `welcome.conf`. Specify a *config* for
-# any module (also implicit instances) to change which file is used.
-#
-# For more information on running module instances, run Calamares in debug
-# mode and check the Modules page in the Debug information interface.
-#
-# A module that is often used with instances is shellprocess, which will
-# run shell commands specified in the configuration file. By configuring
-# more than one instance of the module, multiple shell sessions can be run
-# during install.
-#
-# YAML: list of maps of string:string key-value pairs.
-instances:
-- id:       unfree
-  module:   packagechooserq
-  config:   unfree.conf
-
 # Sequence section. This section describes the sequence of modules, both
 # viewmodules and jobmodules, as they should appear and/or run.
 #
@@ -118,8 +62,6 @@ sequence:
   - locale
   - keyboard
   - users
-  - packagechooser
-  - packagechooserq@unfree
   - partition
   - summary
 - exec:
@@ -130,7 +72,7 @@ sequence:
   - umount
 - show:
   - finished
-
+-
 # A branding component is a directory, either in SHARE/calamares/branding or
 # in /etc/calamares/branding (the latter takes precedence). The directory must
 # contain a YAML file branding.desc which may reference additional resources