Reduce installer complexity

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