small update

calamares/branding/manjaro/branding.desc

@@ -1,87 +0,0 @@
----
-componentName:  manjaro
-
-# This selects between different welcome texts. When false, uses
-# the traditional "Welcome to the %1 installer.", and when true,
-# uses "Welcome to the Calamares installer for %1." This allows
-# to distinguish this installer from other installers for the
-# same distribution.
-welcomeStyleCalamares:   false
-
-# Should the welcome image (productWelcome, below) be scaled
-# up beyond its natural size? If false, the image does not grow
-# with the window but remains the same size throughout (this
-# may have surprising effects on HiDPI monitors).
-welcomeExpandingLogo:   true
-
-# Size and expansion policy for Calamares.
-#  - "normal" or unset, expand as needed, use *windowSize*
-#  - "fullscreen", start as large as possible, ignore *windowSize*
-#  - "noexpand", never expand, use *windowSize*
-windowExpanding:    noexpand
-
-# Size of Calamares window, expressed as w,h. Both w and h
-# may be either pixels (suffix px) or font-units (suffix em).
-#   e.g.    "800px,600px"
-#           "60em,480px"
-# This setting is ignored if "fullscreen" is selected for
-# *windowExpanding*, above. If not set, use constants defined
-# in CalamaresUtilsGui, 800x520.
-windowSize: 800px,520px
-
-# These are strings shown to the user in the user interface.
-# There is no provision for translating them -- since they
-# are names, the string is included as-is.
-#
-# The four Url strings are the Urls used by the buttons in
-# the welcome screen, and are not shown to the user. Clicking
-# on the "Support" button, for instance, opens the link supportUrl.
-# If a Url is empty, the corresponding button is not shown.
-#
-# bootloaderEntryName is how this installation / distro is named
-# in the boot loader (e.g. in the GRUB menu).
-strings:
-    productName:         TROMjaro Linux
-    shortProductName:    TROMjaro
-    version:             18.0
-    shortVersion:        18.0
-    versionedName:       TROMjaro Linux 18.0 "Illyria"
-    shortVersionedName:  TROMjaro 18.0
-    bootloaderEntryName: TROMjaro
-
-# These images are loaded from the branding module directory.
-#
-# productIcon is used as the window icon, and will (usually) be used
-#       by the window manager to represent the application. This image
-#       should be square, and may be displayed by the window manager
-#       as small as 16x16 (but possibly larger).
-# productLogo is used as the logo at the top of the left-hand column
-#       which shows the steps to be taken. The image should be square,
-#       and is displayed at 80x80 pixels (also on HiDPI).
-# productWelcome is shown on the welcome page of the application in
-#       the middle of the window, below the welcome text. It can be
-#       any size and proportion, and will be scaled to fit inside
-#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
-#       Recommended size is 320x150.
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-# The slideshow is displayed during execution steps (e.g. when the
-# installer is actually writing to disk and doing other slow things).
-slideshow:               "show.qml"
-
-# Colors for text and background components.
-#
-#  - sidebarBackground is the background of the sidebar
-#  - sidebarText is the (foreground) text color
-#  - sidebarTextHighlight sets the background of the selected (current) step.
-#    Optional, and defaults to the application palette.
-#  - sidebarSelect is the text color of the selected step.
-#
-style:
-   sidebarBackground:    "#454948"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#4d915e"
-   sidebarTextHighlight: "#1a1c1b"

calamares/branding/tromjaro/branding.desc

@@ -0,0 +1,23 @@
+---
+componentName:  tromjaro
+
+strings:
+    productName:         TROMjaro Linux
+    shortProductName:    TROMjaro
+    version:             18.1.2
+    shortVersion:        18.1.2
+    versionedName:       TROMjaro Linux 18.1.2 "Juhraya"
+    shortVersionedName:  TROMjaro 18.1.2
+    bootloaderEntryName: TROMjaro
+
+images:
+    productLogo:         "logo.png"
+    productIcon:         "logo.png"
+    productWelcome:      "languages.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#454948"
+   sidebarText:          "#efefef"
+   sidebarTextSelect:    "#7abaec"

calamares/branding/tromjaro/show.qml

@@ -28,20 +28,113 @@ Presentation
     id: presentation
 
     Timer {
-        interval: 20000
+        interval: 15000
         running: true
         repeat: true
         onTriggered: presentation.goToNextSlide()
     }
     
     Slide {
+        anchors.fill: parent
+
+        Image {
+            id: background
+            source: "slide1.png"
+            
+            
+            anchors.fill: parent
+        }
+        Text {
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: ""
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
+    }
+        Slide {
+            anchors.fill: parent
+       
 
         Image {
             id: background1
-            source: "slide1.png"
+            source: "slide2.png"
-            width: 800; height: 440
+            
-            fillMode: Image.PreserveAspectFit
+            
-            anchors.centerIn: parent
+            anchors.fill: parent
+        }
+        Text {
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: ""
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
+    }
+        Slide {
+           anchors.fill: parent
+        Image {
+            id: background2
+            source: "slide3.png"
+            
+            
+            anchors.fill: parent
+        }
+        Text {
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: ""
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
+    }
+        Slide {
+           anchors.fill: parent
+        Image {
+            id: background3
+            source: "slide4.png"
+            
+            
+            anchors.fill: parent
+        }
+        Text {
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: ""
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
+    }
+        Slide {
+           anchors.fill: parent
+        Image {
+            id: background4
+            source: "slide5.png"
+            
+            
+            anchors.fill: parent
+        }
+        Text {
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: ""
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
+    }
+        Slide {
+            anchors.fill: parent
+        Image {
+            id: background5
+            source: "slide6.png"
+            
+            
+            anchors.fill: parent
         }
         Text {
             anchors.horizontalCenter: background1.horizontalCenter
@@ -54,13 +147,13 @@ Presentation
     }
 
     Slide {
-
+           anchors.fill: parent
         Image {
-            id: background2
+            id: background6
-            source: "slide2.png"
+            source: "slide7.png"
-            width: 800; height: 440
+            
-            fillMode: Image.PreserveAspectFit
+            
-            anchors.centerIn: parent
+            anchors.fill: parent
         }
         Text {
             anchors.horizontalCenter: background2.horizontalCenter
@@ -73,13 +166,13 @@ Presentation
     }
 
     Slide {
-
+           anchors.fill: parent
         Image {
-            id: background3
+            id: background7
-            source: "slide3.png"
+            source: "slide8.png"
-            width: 800; height: 440
+            
-            fillMode: Image.PreserveAspectFit
+            
-            anchors.centerIn: parent
+            anchors.fill: parent
         }
         Text {
             anchors.horizontalCenter: background3.horizontalCenter
@@ -92,13 +185,13 @@ Presentation
     }
 
     Slide {
-
+          anchors.fill: parent 
         Image {
-            id: background4
+            id: background8
-            source: "slide4.png"
+            source: "slide9.png"
-            width: 800; height: 440
+            
-            fillMode: Image.PreserveAspectFit
+            
-            anchors.centerIn: parent
+            anchors.fill: parent
         }
         Text {
             anchors.horizontalCenter: background4.horizontalCenter
@@ -111,13 +204,13 @@ Presentation
     }
 
     Slide {
-
+        anchors.fill: parent
         Image {
-            id: background5
+            id: background9
-            source: "slide5.png"
+            source: "slide10.png"
-            width: 800; height: 440
+            
-            fillMode: Image.PreserveAspectFit
+            
-            anchors.centerIn: parent
+            anchors.fill: parent
         }
         Text {
             anchors.horizontalCenter: background5.horizontalCenter

calamares/branding/tromjaro/stylesheet.qss

@@ -0,0 +1,31 @@
+/*
+A branding component can ship a stylesheet (like this one)
+which is applied to parts of the Calamares user-interface.
+In principle, all parts can be styled through CSS.
+Missing parts should be filed as issues.
+
+The IDs are based on the object names in the C++ code.
+
+Documentation for styling Qt Widgets through a stylesheet
+can be found at
+    https://doc.qt.io/qt-5/stylesheet-examples.html
+In Calamares, styling widget classes is supported (e.g.
+using `QComboBox` as a selector). You can also use specific
+object names (ids), which you can find through debugging tools.
+*/
+
+
+#mainText{
+	font : bold 18px;
+}
+
+#logoApp {
+    min-height: 80px;
+    margin-bottom: 50px;
+}
+
+
+QVBoxLayout {
+    background-color: pink;
+    color: pink;
+}

calamares/modules/bootloader.conf

@@ -1,54 +1,15 @@
-# Bootloader configuration. The bootloader is installed to allow
-# the system to start (and pick one of the installed operating
-# systems to run).
 ---
-# Define which bootloader you want to use for EFI installations
-# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
 efiBootLoader: "grub"
-
+kernel: "/vmlinuz-4.19-x86_64"
-# systemd-boot configuration files settings, set kernel and initramfs file names
+img: "/initramfs-4.19-x86_64.img"
-# and amount of time before default selection boots
+fallback: "/initramfs-4.19-x86_64-fallback.img"
-kernel: "_ALL_kver_"
-img: "_default_image_"
-fallback: "_fallback_image_"
 timeout: "10"
-
+kernelLine: ", with linux419"
-# Optionally set the menu entry name and kernel name to use in systemd-boot.
+fallbackKernelLine: ", with linux419 (fallback initramfs)"
-# If not specified here, these settings will be taken from branding.desc.
-#
-# bootloaderEntryName: "Manjaro"
-kernelLine: ", with _manjaro_kernel_"
-fallbackKernelLine: ", with _manjaro_kernel_ (fallback initramfs)"
-
-# 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/<dirname>/ . When
-# setting the option here, keep in mind that the name is sanitized
-# (problematic characters, see above, are replaced).
-#
 #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

calamares/modules/displaymanager.conf

@@ -1,58 +1,10 @@
-# Configure one or more display managers (e.g. SDDM)
-# with a "best effort" approach.
-#
-# This module also sets up autologin, if the feature is enabled in
-# globalstorage (where it would come from the users page).
 ---
-# The DM module attempts to set up all the DMs found in this list, in the
-# precise order listed. The displaymanagers list can also be set in
-# globalstorage, and in that case it overrides the setting here.
-#
-# If *sysconfigSetup* is set to *true* (see below, only relevant for
-# openSUSE derivatives) then this list is ignored and only sysconfig
-# is attempted. You can also list "sysconfig" in this list instead.
-#
 displaymanagers:
-  - slim
-  - sddm
   - lightdm
   - gdm
   - mdm
+  - sddm
   - lxdm
-  - kdm
+  - slim
 
-# Enable the following settings to force a desktop environment
-# in your displaymanager configuration file. This will attempt
-# to configure the given DE (without checking if it is installed).
-# The DM configuration for each potential DM may **or may not**
-# support configuring a default DE, so the keys are mandatory
-# but their interpretation is up to the DM configuration.
-#
-# Subkeys of *defaultDesktopEnvironment* are (all mandatory):
-#  - *executable* a full path to an executable
-#  - *desktopFile* a .desktop filename
-#
-# If this is **not** set, then Calamares will look for installed
-# DE's and pick the first one it finds that is actually installed.
-#
-# If this **is** set, and the *executable* key doesn't point to
-# an installed file, then the .desktop file's TryExec key is
-# used instead.
-#
-
-#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.
-#
-# The preferred way to pick sysconfig is to just list it in the
-# *displaymanagers* list (as the only one).
-#
-sysconfigSetup: false

calamares/modules/finished.conf

@@ -1,44 +1,4 @@
-# Configuration for the "finished" page, which is usually shown only at
-# the end of the installation (successful or not).
 ---
-# DEPRECATED
+restartNowEnabled: true
-#
+restartNowChecked: false
-# The finished page can hold a "restart system now" checkbox.
+restartNowCommand: "systemctl reboot"
-# 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:
-#   - never
-#       Does not show the button and does not restart.
-#       This matches the old behavior with restartNowEnabled=false.
-#   - user-unchecked
-#       Shows the button, defaults to unchecked, restarts if it is checked.
-#       This matches the old behavior with restartNowEnabled=true and restartNowChecked=false.
-#   - user-checked
-#       Shows the button, defaults to checked, restarts if it is checked.
-#       This matches the old behavior with restartNowEnabled=true and restartNowChecked=true.
-#   - always
-#       Shows the button, checked, but the user cannot change it.
-#       This is new behavior.
-#
-# The three combinations of legacy values are still supported.
-restartNowMode: user-unchecked
-
-# If the checkbox is shown, and the checkbox is checked, then when
-# Calamares exits from the finished-page it will run this command.
-# If not set, falls back to "shutdown -r now".
-restartNowCommand: "systemctl -i reboot"
-
-# When the last page is (successfully) reached, send a DBus notification
-# to the desktop that the installation is done. This works only if the
-# user as whom Calamares is run, can reach the regular desktop session bus.
-notifyOnFinished: false

calamares/modules/initcpio.conf

@@ -1,22 +1,2 @@
-# Run mkinitcpio(8) with the given preset value
 ---
-# This key defines the kernel to be loaded.
+kernel: linux419
-# It can have the following values:
-#  - empty or unset, interpreted as "all"
-#  - the literal string "$uname" (without quotes, with dollar),
-#    which will use the output of `uname -r` to determine the
-#    running kernel, and use that.
-#  - any other string.
-#
-# Whatever is set, that string is passed as *preset* argument to the
-# `-p` option of *mkinitcpio*. Take care that both "$uname" operates
-# in the host system, and might not be correct if the target system is
-# updated (to a newer kernel) as part of the installation.
-#
-# Note that "all" is probably not a good preset to use either.
-kernel: linux312
-
-# Set this to true to turn off mitigations for lax file
-# permissions on initramfs (which, in turn, can compromise
-# your LUKS encryption keys, CVS-2019-13179).
-be_unsafe: false

calamares/modules/locale.conf

@@ -1,97 +1,5 @@
 ---
-# This settings are used to set your default system time zone.
+localeGenPath: /etc/locale.gen
-# Time zones are usually located under /usr/share/zoneinfo and
+geoipUrl: https://get.geojs.io/v1/ip/geo.json
-# provided by the 'tzdata' package of your Distribution.
+geoipStyle: json
-#
+geoipSelector: timezone
-# Distributions using systemd can list available
-# time zones by using the timedatectl command.
-#    timedatectl list-timezones
-#
-# The starting timezone (e.g. the pin-on-the-map) when entering
-# the locale page can be set through keys *region* and *zone*.
-# If either is not set, defaults to America/New_York.
-#
-region:                     "America"
-zone:                       "New_York"
-
-
-# System locales are detected in the following order:
-#
-#  - /usr/share/i18n/SUPPORTED
-#  - localeGenPath (defaults to /etc/locale.gen if not set)
-#  - 'locale -a' output
-#
-# Enable only when your Distribution is using an
-# custom path for locale.gen
-#
-#localeGenPath:             "PATH_TO/locale.gen"
-
-# GeoIP based Language settings: Leave commented out to disable GeoIP.
-#
-# GeoIP needs a working Internet connection.
-# This can be managed from `welcome.conf` by adding
-# internet to the list of required conditions.
-#
-# The configuration
-# is in three parts: a *style*, which can be "json" or "xml"
-# depending on the kind of data returned by the service, and
-# a *url* where the data is retrieved, and an optional *selector*
-# to pick the right field out of the returned data (e.g. field
-# name in JSON or element name in XML).
-#
-# The default selector (when the setting is blank) is picked to
-# work with existing JSON providers (which use "time_zone") and
-# Ubiquity's XML providers (which use "TimeZone").
-#
-# If the service configured via *url* uses
-# a different attribute name (e.g. "timezone") in JSON or a
-# different element tag (e.g. "<Time_Zone>") in XML, set this
-# string to the name or tag to be used.
-#
-# In JSON:
-#  - if the string contains "." characters, this is used as a
-#    multi-level selector, e.g. "a.b" will select the timezone
-#    from data "{a: {b: "Europe/Amsterdam" } }".
-#  - each part of the string split by "." characters is used as
-#    a key into the JSON data.
-# In XML:
-#  - all elements with the named tag (e.g. all TimeZone) elements
-#    from the document are checked; the first one with non-empty
-#    text value is used.
-#
-#
-# An HTTP(S) request is made to *url*. The request should return
-# valid data in a suitable format, depending on *style*;
-# generally this includes a string value with the timezone
-# in <region>/<zone> format. For services that return data which
-# does not follow the conventions of "suitable data" described
-# below, *selector* may be used to pick different data.
-#
-# Note that this example URL works, but the service is shutting
-# down in June 2018.
-#
-# Suitable JSON data looks like
-# ```
-#    {"time_zone":"America/New_York"}
-# ```
-# Suitable XML data looks like
-# ```
-#    <Response><TimeZone>Europe/Brussels</TimeZone></Response>
-# ```
-#
-# To accommodate providers of GeoIP timezone data with peculiar timezone
-# naming conventions, the following cleanups are performed automatically:
-#  - backslashes are removed
-#  - spaces are replaced with _
-#
-# Legacy settings "geoipStyle", "geoipUrl" and "geoipSelector"
-# in the top-level are still supported, but I'd advise against.
-#
-# To disable GeoIP checking, either comment-out the entire geoip section,
-# 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: ""  # leave blank for the default

calamares/modules/machineid.conf

@@ -1,24 +1,4 @@
-# Machine-ID and other random data on the target system.
-#
-# This module can create a number of "random" things on the target:
-#  - a systemd machine-id file (hence the name of the Calamares module)
-#    with a random UUID.
-#  - a dbus machine-id file (or, optionally, link to the one from systemd)
-#  - an entropy file
-#
 ---
-# Whether to create /etc/machine-id for systemd.
 systemd: true
-
-# Whether to create /var/lib/dbus/machine-id for D-Bus.
 dbus: true
-# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
-# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
-dbus-symlink: true
-# this is a deprecated form of *dbus-symlink*
 symlink: true
-
-# Whether to create an entropy file
-entropy: false
-# Whether to copy entropy from the host
-entropy-copy: false

calamares/modules/mhwdcfg.conf

@@ -1,7 +1,6 @@
 ---
 bus:
     - pci
-#    - usb
 
 identifier:
     net:
@@ -12,8 +11,8 @@ identifier:
       - 302
       - 380
 
-driver: free
+driver: nonfree
 
 local: true
 
-repo: /opt/mhwd/pacman-mhwd.conf
+repo: /opt/pacman-mhwd.conf

calamares/modules/services.conf

@@ -1,81 +1,29 @@
-# Systemd services manipulation.
-#
-# This module can enable services and targets for systemd
-# (if packaging doesn't already do that). It can calso
-# disable services (but not targets).
-#
-# First, services are enabled; then targets; then services
-# are disabled -- this order of operations is fixed.
----
-
-# There are three configuration keys for this module:
-# *services*, *targets* and *disable*. The value of each
-# key is a list of entries. Each entry has two keys:
-#   - *name* is the (string) name of the service or target that is being
-#     changed. Use quotes. Don't include ".target" or ".service"
-#     in the name.
-#   - *mandatory* is a boolean option, which states whether the change
-#     must be done successfully. If systemd reports an error while changing
-#     a mandatory entry, the installation will fail. When mandatory is false,
-#     errors for that entry (service or target) are ignored. If mandatory
-#     is not specified, the default is false.
-#
-# An entry may also be given as a single string, which is then
-# interpreted as the name of the service. In this case, mandatory
-# is also set to the default of false.
-#
-# Use [] to express an empty list.
-
-# # This example enables NetworkManager (and fails if it can't),
-# # disables cups (and ignores failure). Then it enables the
-# # graphical target (e.g. so that SDDM runs for login), and
-# # finally disables pacman-init (an ArchLinux-only service).
-# #
-# # Enables <name>.service
-# services:
-#   - name: "NetworkManager"
-#     mandatory: true
-#   - name: "cups"
-#     mandatory: false
-#
-# # Enables <name>.target
-# targets:
-#   - name: "graphical"
-#     mandatory: true
-#
-# # Disables <name>.service
-# disable:
-#   - name: "pacman-init"
-#     mandatory: false
-#
-# # Disables <name>.target
-# #     .. this shows how to use just the name
-# disable-targets:
-#   - graphical
-#
-# # Masks (stronger version of disable). This section
-# # is unusual because you **must** include the suffix
-# # (e.g. ".service") as part of the name, so, e.g. to mask
-# # NetworkManager (rather than just disable it) you must
-# # specify "NetworkManager.service" as name.
-# mask:
-#  - name: "NetworkManager.service"
-#  - mandatory: true
-
-# By default, no changes are made.
-#services: []
-#targets: []
-#disable: []
-disable-targets: []
-mask: []
-
-# Manjaro settings
-
 services:
-  - name: "NetworkManager"
+    - name: bluetooth
       mandatory: false
 
-  - name: "org.cups.cupsd"
+    - name: ModemManager
+      mandatory: false
+
+    - name: cronie
+      mandatory: false
+
+    - name: NetworkManager
+      mandatory: false
+
+    - name: org.cups.cupsd
+      mandatory: false
+
+    - name: tlp
+      mandatory: false
+
+    - name: tlp-sleep
+      mandatory: false
+
+    - name: avahi-demon
+      mandatory: false
+
+    - name: gdm
       mandatory: false
 
 targets:
@@ -83,5 +31,6 @@ targets:
       mandatory: true
 
 disable:
-  - name: "pacman-init"
+    - name: pacman-init
       mandatory: false
+

calamares/modules/unpackfs.conf

@@ -1,89 +1,8 @@
-# Unsquash / unpack a filesystem. Multiple sources are supported, and
-# they may be squashed or plain filesystems.
-#
-# Configuration:
-#
-#   from globalstorage: rootMountPoint
-#   from job.configuration: the path to where to mount the source image(s)
-#       for copying an ordered list of unpack mappings for image file <->
-#       target dir relative to rootMountPoint.
-
 ---
-# Each list item is unpacked, in order, to the target system.
-#
-# Each list item has the following **mandatory** attributes:
-#   - *source* path relative to the live / intstalling system to the image
-#   - *sourcefs* the type of the source files; valid entries are
-#       - `ext4` (copies the filesystem contents)
-#       - `squashfs` (unsquashes)
-#       - `file` (copies a file or directory)
-#       - (may be others if mount supports it)
-#   - *destination* path relative to rootMountPoint (so in the target
-#       system) where this filesystem is unpacked. It may be an
-#       empty string, which effectively is / (the root) of the target
-#       system.
-#
-# Each list item **optionally** can include the following attributes:
-#   - *exclude* is a list of values that is expanded into --exclude
-#       arguments for rsync (each entry in exclude gets its own --exclude).
-#   - *excludeFile* is a single file that is passed to rsync as an
-#       --exclude-file argument. This should be a full pathname
-#       inside the **host** filesystem.
-#
-# EXAMPLES
-#
-# Usually you list a filesystem image to unpack; you can use
-# squashfs or an ext4 image. An empty destination is equivalent to "/",
-# the root of the target system. The destination directory must exist
-# in the target system.
-#
-#   -   source: "/path/to/filesystem.sqfs"
-#       sourcefs: "squashfs"
-#       destination: ""
-#
-# Multiple entries are unpacked in-order; if there is more than one
-# item then only the first must exist beforehand -- it's ok to
-# create directories with one unsquash and then to use those
-# directories as a target from a second unsquash.
-#
-#   -   source: "/path/to/another/filesystem.img"
-#       sourcefs: "ext4"
-#       destination: ""
-#   -   source: "/path/to/another/filesystem2.img"
-#       sourcefs: "ext4"
-#       destination: "/usr/lib/extra"
-#
-# You can list filesystem source paths relative to the Calamares run
-# directory, if you use -d (this is only useful for testing, though).
-#
-#    -   source: ./example.sqfs
-#        sourcefs: squashfs
-#        destination: ""
-#
-# You can list individual files (copied one-by-one), or directories
-# (the files inside this directory are copied directly to the destination,
-# so no "dummycpp/" subdirectory is created in this example).
-# Do note that the target directory must exist already (e.g. from
-# extracting some other filesystem).
-#
-#    -   source: ../CHANGES
-#        sourcefs: file
-#        destination: "/tmp/derp"
-#    -   source: ../src/modules/dummycpp
-#        sourcefs: file
-#        destination: "/tmp/derp"
-#
-# The *destination* and *source* are handed off to rsync, so the semantics
-# of trailing slashes apply. In order to *rename* a file as it is
-# copied, specify one single file (e.g. CHANGES) and a full pathname
-# for its destination name, as in the example below.
-
 unpack:
-    -   source: ../CHANGES
+    - source: "/run/miso/bootmnt/manjaro/x86_64/rootfs.sfs"
-        sourcefs: file
+      sourcefs: "squashfs"
-        destination: "/tmp/changes.txt"
+      destination: ""
-    -   source: src/qml/calamares/slideshow
+    - source: "/run/miso/bootmnt/manjaro/x86_64/desktopfs.sfs"
-        sourcefs: file
+      sourcefs: "squashfs"
-        destination: "/tmp/slideshow/"
+      destination: ""
-        exclude: [ "*.qmlc", "qmldir" ]
-        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt

calamares/modules/users.conf

@@ -1,85 +1,14 @@
-# Configuration for the one-user-system user module.
-#
-# Besides these settings, the user module also places the following
-# keys into the globalconfig area, based on user input in the view step.
-#
-# - hostname
-# - username
-# - password (obscured)
-# - autologinUser (if enabled, set to username)
-#
-# These globalconfig keys are set when the jobs for this module
-# are created.
 ---
-# Used as default groups for the created user.
-# Adjust to your Distribution defaults.
 defaultGroups:
-    - users
     - lp
-    - video
     - network
-    - storage
+    - power
+    - sys
     - wheel
-    - audio
-
-# 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
-# You can control the initial state for the 'autologin checkbox' in UsersViewStep here.
+doAutologin:     false
-# Possible values are: true to enable or false to disable the checkbox by default
-doAutologin:     true
-
-# When set to a non-empty string, Calamares creates a sudoers file for the user.
-#  /etc/sudoers.d/10-installer
-# Remember to add 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
-
-# Setting this to false , causes the root account to be disabled.
 setRootPassword: true
-# You can control the initial state for the 'root password checkbox' in UsersViewStep here.
+doReusePassword: false
-# Possible values are: true to enable or false to disable the checkbox by default.
+availableShells: /bin/bash, /bin/zsh
-# When enabled the user password is used for the root account too.
+avatarFilePath:  ~/.face
-# NOTE: doReusePassword requires setRootPassword to be enabled.
-doReusePassword: true
-
-# These are optional password-requirements that a distro can enforce
-# on the user. The values given in this sample file disable each check,
-# as if the check was not listed at all.
-#
-# Checks may be listed multiple times; each is checked separately,
-# and 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).
-#
-# The libpwquality check relies on the (optional) libpwquality library.
-# Its value is a list of configuration statements that could also
-# be found in pwquality.conf, and these 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)
-passwordRequirements:
-    minLength: -1  # Password at least this many characters
-    maxLength: -1  # Password at most this many characters
-    libpwquality:
-        - minlen=0
-        - minclass=0
-
-# Shell to be used for the regular user of the target system.
-# There are three possible kinds of settings:
-#  - unset (i.e. commented out, the default), act as if set to /bin/bash
-#  - empty (explicit), don't pass shell information to useradd at all
-#    and rely on a correct configuration file in /etc/default/useradd
-#  - set, non-empty, use that path as shell. No validation is done
-#    that the shell actually exists or is executable.
-# userShell: /bin/bash

calamares/modules/welcome.conf

@@ -1,92 +1,19 @@
-# Configuration for the welcome module. The welcome page
-# displays some information from the branding file.
-# Which parts it displays can be configured through
-# the show* variables.
-#
-# In addition to displaying the welcome page, this module
-# can check requirements for installation.
 ---
-# Display settings for various buttons on the welcome page.
-# The URLs themselves come from branding.desc is the setting
-# here is "true". If the setting is false, the button is hidden.
-# The setting can also be a full URL which will then be used
-# instead of the one from the branding file, or empty or not-set
-# which will hide the button.
 showSupportUrl:         true
 showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
-# If this Url is set to something non-empty, a "donate"
-# button is added to the welcome page alongside the
-# others (see settings, above). Clicking the button opens
-# the corresponding link. (This button has no corresponding
-# branding.desc string)
-#
-# showDonateUrl:  https://kde.org/community/donations/
-
-# Requirements checking. These are general, generic, things
-# that are checked. They may not match with the actual requirements
-# imposed by other modules in the system.
 requirements:
-    # Amount of available disk, in GiB. Floating-point is allowed here.
+    requiredStorage:    7.9
-    # Note that this does not account for *usable* disk, so it is possible
-    # to pass this requirement, yet have no space to install to.
-    requiredStorage:    5.5
-
-    # Amount of available RAM, in GiB. Floating-point is allowed here.
     requiredRam:        1.0
-
+    internetCheckUrl:   https://manjaro.org
-    # To check for internet connectivity, Calamares does a HTTP GET
-    # on this URL; on success (e.g. HTTP code 200) internet is OK.
-    internetCheckUrl:   http://google.com
-
-    # List conditions to check. Each listed condition will be
-    # probed in some way, and yields true or false according to
-    # the host system satisfying the condition.
-    #
-    # This sample file lists all the conditions that are known.
     check:
       - storage
       - ram
       - power
       - internet
       - root
-        - screen
-    # List conditions that **must** be satisfied (from the list
-    # of conditions, above) for installation to proceed.
-    # If any of these conditions are not met, the user cannot
-    # continue past the welcome page.
     required:
-        # - storage
+      - storage
       - ram
-        # - root
+      - root
-
-# GeoIP checking
-#
-# This can be used to pre-select a language based on the country
-# the user is currently in. It *assumes* that there's internet
-# connectivity, though. Configuration is like in the locale module,
-# but remember to use a URL that returns full data **and** to
-# use a selector that will pick the country, not the timezone.
-#
-# To disable GeoIP checking, either comment-out the entire geoip section,
-# or set the *style* key to an unsupported format (e.g. `none`).
-# Also, note the analogous feature in src/modules/locale/locale.conf.
-#
-geoip:
-    style:    "none"
-    url:      "https://geoip.kde.org/v1/ubiquity"  # extended XML format
-    selector: "CountryCode"  # blank uses default, which is wrong
-
-# User interface
-#
-# The "select language" icon is an international standard, but it
-# might not theme very well with your desktop environment.
-# Fill in an icon name (following FreeDesktop standards) to
-# use that named icon instead of the usual one.
-#
-# Leave blank or unset to use the international standard.
-#
-# Known icons in this space are "set-language" and "config-language".
-#
-# languageIcon: set-language

calamares/settings.conf

@@ -1,89 +1,6 @@
-# Configuration file for Calamares
-# Syntax is YAML 1.2
 ---
-# Modules can be job modules (with different interfaces) and QtWidgets view
-# modules. They could all be placed in a number of different paths.
-# "modules-search" is a list of strings, each of these can either be a full
-# path to a directory or the keyword "local".
-#
-# "local" means:
-#   - modules in $LIBDIR/calamares/modules, with
-#   - settings in SHARE/calamares/modules or /etc/calamares/modules.
-# In debug-mode (e.g. calamares -d) "local" also adds some paths
-# that make sense from inside the build-directory, so that you
-# can build-and-run with the latest modules immediately.
-#
-# Strings other than "local" are taken as paths and interpreted
-# relative to wherever Calamares is started. It is therefore **strongly**
-# recommended to use only absolute paths here. This is mostly useful
-# if your distro has forks of standard Calamares modules, but also
-# uses some form of upstream packaging which might overwrite those
-# forked modules -- then you can keep modules somewhere outside of
-# the "regular" module tree.
-#
-#
-# YAML: list of strings.
 modules-search: [ local ]
 
-# Instances section. This section is optional, and it defines custom instances
-# for modules of any kind. An instance entry has an module name, an instance
-# name, and a configuration file name. 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 must 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`.
-#
-# 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:       owncloud
-#  module:   webview
-#  config:   owncloud.conf
-
-# Sequence section. This section describes the sequence of modules, both
-# viewmodules and jobmodules, as they should appear and/or run.
-#
-# A jobmodule instance key (or name) can only appear in an exec phase, whereas
-# a viewmodule instance key (or name) can appear in both exec and show phases.
-# There is no limit to the number of show or exec phases. However, the same
-# module instance key should not appear more than once per phase, and
-# deployers should take notice that the global storage structure is persistent
-# throughout the application lifetime, possibly influencing behavior across
-# phases. A show phase defines a sequence of viewmodules (and therefore
-# pages). These viewmodules can offer up jobs for the execution queue.
-#
-# An exec phase displays a progress page (with brandable slideshow). This
-# progress page iterates over the modules listed in the *immediately
-# preceding* show phase, and enqueues their jobs, as well as any other jobs
-# from jobmodules, in the order defined in the current exec phase.
-#
-# It then executes the job queue and clears it. If a viewmodule offers up a
-# job for execution, but the module name (or instance key) isn't listed in the
-# immediately following exec phase, this job will not be executed.
-#
-# YAML: list of lists of strings.
 sequence:
     - show:
         - welcome
@@ -96,6 +13,7 @@ sequence:
         - partition
         - mount
         - unpackfs
+        - networkcfg
         - machineid
         - fstab
         - locale
@@ -103,13 +21,11 @@ sequence:
         - localecfg
         - luksopenswaphookcfg
         - luksbootkeyfile
-  - plymouthcfg
         - initcpiocfg
         - initcpio
         - users
         - displaymanager
         - mhwdcfg
-  - networkcfg
         - hwclock
         - services
         - grubcfg
@@ -119,65 +35,8 @@ sequence:
     - show:
         - finished
 
-# A branding component is a directory, either in SHARE/calamares/branding or
+branding: tromjaro
-# in /etc/calamares/branding (the latter takes precedence). The directory must
-# contain a YAML file branding.desc which may reference additional resources
-# (such as images) as paths relative to the current directory.
-#
-# A branding component can also ship a QML slideshow for execution pages,
-# along with translation files.
-#
-# Only the name of the branding component (directory) should be specified
-# here, Calamares then takes care of finding it and loading the contents.
-#
-# YAML: string.
-branding: manjaro
 
-# If this is set to true, Calamares will show an "Are you sure?" prompt right
+prompt-install: true
-# before each execution phase, i.e. at points of no return. If this is set to
-# false, no prompt is shown. Default is false, but Calamares will complain if
-# this is not explicitly set.
-#
-# YAML: boolean.
-prompt-install: false
 
-# If this is set to true, Calamares will execute all target environment
-# commands in the current environment, without chroot. This setting should
-# only be used when setting up Calamares as a post-install configuration tool,
-# as opposed to a full operating system installer.
-#
-# Some official Calamares modules are not expected to function with this
-# setting. (e.g. partitioning seems like a bad idea, since that is expected to
-# have been done already)
-#
-# Default is false (for a normal installer), but Calamares will complain if
-# this is not explicitly set.
-#
-# YAML: boolean.
 dont-chroot: false
-
-# If this is set to true, Calamares refers to itself as a "setup program"
-# rather than an "installer". Defaults to the value of dont-chroot, but
-# Calamares will complain if this is not explicitly set.
-# oem-setup: true
-
-# If this is set to true, the "Cancel" button will be disabled entirely.
-# The button is also hidden from view.
-#
-# This can be useful if when e.g. Calamares is used as a post-install
-# configuration tool and you require the user to go through all the
-# configuration steps.
-#
-# Default is false, but Calamares will complain if this is not explicitly set.
-#
-# YAML: boolean.
-disable-cancel: false
-
-# If this is set to true, the "Cancel" button will be disabled once
-# you start the 'Installation', meaning there won't be a way to cancel
-# the Installation until it has finished or installation has failed.
-#
-# Default is false, but Calamares will complain if this is not explicitly set.
-#
-# YAML: boolean.
-disable-cancel-during-exec: false