From 3a0ad615450ccb89be3f277e83ac569e86c5f7c1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Jan 2025 20:44:22 -0500
Subject: LinHES9_iso: changes for updated calamares and updates

---
 linhes/linhes-dev/LinHES9_iso/build_iso.sh         |  69 ++++--
 .../etc/calamares/branding/LinHES/branding.desc    |  53 ++---
 .../etc/calamares/branding/LinHES/show.qml         | 107 ++-------
 .../etc/calamares/branding/LinHES/stylesheet.qss   |   1 +
 .../airootfs/etc/calamares/modules/bootloader.conf |  23 ++
 .../etc/calamares/modules/displaymanager.conf      |  16 ++
 .../airootfs/etc/calamares/modules/fstab.conf      |  17 ++
 .../airootfs/etc/calamares/modules/grubcfg.conf    |  21 ++
 .../etc/calamares/modules/initcpiocfg.conf         |  11 +
 .../airootfs/etc/calamares/modules/keyboard.conf   |  10 +
 .../airootfs/etc/calamares/modules/locale.conf     |  14 ++
 .../etc/calamares/modules/luksopenswaphookcfg.conf |   8 +
 .../airootfs/etc/calamares/modules/machineid.conf  |  20 ++
 .../airootfs/etc/calamares/modules/mount.conf      |  52 +++++
 .../airootfs/etc/calamares/modules/partition.conf  | 246 ++------------------
 .../etc/calamares/modules/services-systemd.conf    |  16 ++
 .../etc/calamares/modules/shellprocess-before.conf |   4 +-
 .../etc/calamares/modules/shellprocess-final.conf  |  25 +-
 .../airootfs/etc/calamares/modules/users.conf      |  11 +-
 .../cust_skel/airootfs/etc/calamares/settings.conf | 185 +--------------
 .../etc/dkms/framework.conf.d/signkeyfile.conf     |   2 +
 .../cust_skel/airootfs/etc/lightdm/lightdm.conf    | 164 -------------
 .../LinHES9_iso/cust_skel/airootfs/etc/pacman.conf |  26 ++-
 .../airootfs/etc/sddm.conf.d/autologin.conf        |   2 +-
 .../cust_skel/airootfs/etc/sddm.conf.d/theme.conf  |   6 +
 .../etc/skel/.config/autostart/calamares.desktop   | 253 +--------------------
 .../etc/skel/.config/powermanagementprofilesrc     |   5 +
 .../airootfs/etc/skel/Desktop/calamares.desktop    |   1 +
 .../cust_skel/airootfs/etc/sudoers.d/g_wheel       |   1 +
 .../airootfs/etc/systemd/system/locale-gen.service |  10 +
 .../cust_skel/airootfs/root/customize_airootfs.sh  |   8 -
 .../cust_skel/airootfs/usr/bin/calamares_polkit    |   6 -
 .../airootfs/usr/share/LinHES/calamares.desktop    | 252 --------------------
 .../loader/entries/01-archiso-x86_64-linux.conf    |   2 -
 .../entries/02-archiso-x86_64-speech-linux.conf    |   2 -
 .../entries/03-archiso-x86_64-memtest86+.conf      |   3 +
 .../linhes-dev/LinHES9_iso/cust_skel/grub/grub.cfg |   4 +-
 .../LinHES9_iso/cust_skel/packages.x86_64          |   3 +
 .../linhes-dev/LinHES9_iso/cust_skel/pacman.conf   |  19 +-
 .../linhes-dev/LinHES9_iso/cust_skel/profiledef.sh |   7 +-
 .../cust_skel/syslinux/archiso_pxe-linux.cfg       |   6 +-
 .../cust_skel/syslinux/archiso_sys-linux.cfg       |   4 +-
 .../cust_skel/syslinux/archiso_tail.cfg            |   2 +-
 43 files changed, 415 insertions(+), 1282 deletions(-)
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/bootloader.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/displaymanager.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/fstab.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/grubcfg.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/initcpiocfg.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/keyboard.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/locale.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/luksopenswaphookcfg.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/machineid.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/mount.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/services-systemd.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/dkms/framework.conf.d/signkeyfile.conf
 delete mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/lightdm/lightdm.conf
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/theme.conf
 mode change 100755 => 120000 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/powermanagementprofilesrc
 create mode 120000 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/Desktop/calamares.desktop
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sudoers.d/g_wheel
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/systemd/system/locale-gen.service
 delete mode 100755 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/root/customize_airootfs.sh
 delete mode 100755 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/bin/calamares_polkit
 delete mode 100755 linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/share/LinHES/calamares.desktop
 create mode 100644 linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf

diff --git a/linhes/linhes-dev/LinHES9_iso/build_iso.sh b/linhes/linhes-dev/LinHES9_iso/build_iso.sh
index 51aba98..8399fb4 100755
--- a/linhes/linhes-dev/LinHES9_iso/build_iso.sh
+++ b/linhes/linhes-dev/LinHES9_iso/build_iso.sh
@@ -55,9 +55,9 @@ trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
 
 # Clean up working directories
 cleanup () {
-[[ -d ./arch_skel ]] && rm -r ./arch_skel
-[[ -d ./work ]] && rm -r ./work
-sleep 2
+  [[ -d ./arch_skel ]] && rm -r ./arch_skel
+  [[ -d ./work ]] && rm -r ./work
+  sleep 2
 }
 
 # Requirements and preparation
@@ -102,38 +102,37 @@ prereqs() {
 
 # Copy Arch profile to working directory
 cp_releng () {
-cp -r /usr/share/archiso/configs/releng/ ./arch_skel
-rm -r ./arch_skel/efiboot
-rm -r ./arch_skel/syslinux
+  cp -r /usr/share/archiso/configs/releng/ ./arch_skel
+  rm -r ./arch_skel/efiboot
+  rm -r ./arch_skel/syslinux
 }
 
 # Copy cust_repo to opt
 cp_repo () {
-if [ -d "./cust_repo" ]
-then
+  if [ -d "./cust_repo" ]
+  then
     cp -r ./cust_repo /opt/repo
-fi
+  fi
 }
 
 # Remove ezrepo from opt
 rm_repo () {
-if [ -d "/opt/repo" ]
-then
+  if [ -d "/opt/repo" ]
+  then
     rm -r /opt/repo
-fi
+  fi
 }
 
 # Delete automatic login
 nalogin () {
-rm -r ./arch_skel/airootfs/etc/systemd/system/getty@tty1.service.d
+  rm -r ./arch_skel/airootfs/etc/systemd/system/getty@tty1.service.d
 }
 
-# Remove cloud-init, hyper-v, qemu-guest, vmtoolsd, sshd, systemd-networkd & iwd services
+# Remove cloud-init, hyper-v, vmtoolsd, sshd, systemd-networkd & iwd services
 rmunitsd () {
 rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service
 rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service
 rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service
-rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
 rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
 rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service
 rm ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
@@ -163,7 +162,8 @@ ln -sf /usr/lib/systemd/system/cups.service ./arch_skel/airootfs/etc/systemd/sys
 ln -sf /usr/lib/systemd/system/cups.socket ./arch_skel/airootfs/etc/systemd/system/sockets.target.wants/cups.socket
 ln -sf /usr/lib/systemd/system/cups.path ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/cups.path
 ln -sf /usr/lib/systemd/system/bluetooth.service ./arch_skel/airootfs/etc/systemd/system/dbus-org.bluez.service
-ln -sf /usr/lib/systemd/system/lightdm.service ./arch_skel/airootfs/etc/systemd/system/display-manager.service
+ln -sf /usr/lib/systemd/system/sddm.service ./arch_skel/airootfs/etc/systemd/system/display-manager.service
+ln -sf /usr/lib/systemd/system/locale-gen.service ./arch_skel/airootfs/etc/systemd/system/multi-user.target.wants/locale-gen.service
 }
 
 # Copy files to customize the ISO
@@ -179,7 +179,7 @@ cp -r ./cust_skel/airootfs ./arch_skel/
 
 # Set hostname
 sethostname () {
-echo "${MYHOSTNM}" > ./arch_skel/airootfs/etc/hostname
+  echo "${MYHOSTNM}" > ./arch_skel/airootfs/etc/hostname
 }
 
 # Create passwd file
@@ -201,14 +201,16 @@ network:x:90:"${MYUSERNM}"
 floppy:x:94:"${MYUSERNM}"
 scanner:x:96:"${MYUSERNM}"
 power:x:98:"${MYUSERNM}"
-rfkill:x:850:"${MYUSERNM}"
-users:x:985:"${MYUSERNM}"
-video:x:860:"${MYUSERNM}"
-storage:x:870:"${MYUSERNM}"
-optical:x:880:"${MYUSERNM}"
-lp:x:840:"${MYUSERNM}"
-audio:x:890:"${MYUSERNM}"
+uucp:x:810:"${MYUSERNM}"
+audio:x:820:"${MYUSERNM}"
+lp:x:830:"${MYUSERNM}"
+rfkill:x:840:"${MYUSERNM}"
+video:x:850:"${MYUSERNM}"
+storage:x:860:"${MYUSERNM}"
+optical:x:870:"${MYUSERNM}"
+sambashare:x:880:"${MYUSERNM}"
 autologin:x:965:"${MYUSERNM}"
+users:x:985:"${MYUSERNM}"
 "${MYUSERNM}":x:1000:" > ./arch_skel/airootfs/etc/group
 }
 
@@ -223,6 +225,22 @@ echo "root:"${root_hash}":14871::::::
 # create gshadow file
 crtgshadow () {
 echo "root:!*::root
+sys:!*::"${MYUSERNM}"
+adm:!*::"${MYUSERNM}"
+wheel:!*::"${MYUSERNM}"
+log:!*::"${MYUSERNM}"
+network:!*::"${MYUSERNM}"
+floppy:!*::"${MYUSERNM}"
+scanner:!*::"${MYUSERNM}"
+power:!*::"${MYUSERNM}"
+uucp:!*::"${MYUSERNM}"
+audio:!*::"${MYUSERNM}"
+lp:!*::"${MYUSERNM}"
+rfkill:!*::"${MYUSERNM}"
+video:!*::"${MYUSERNM}"
+storage:!*::"${MYUSERNM}"
+optical:!*::"${MYUSERNM}"
+sambashare:!*::"${MYUSERNM}"
 "${MYUSERNM}":!*::" > ./arch_skel/airootfs/etc/gshadow
 }
 
@@ -244,8 +262,9 @@ EndSection" > ./arch_skel/airootfs/etc/X11/xorg.conf.d/00-keyboard.conf
 
 # Fix 40-locale-gen.hook and create locale.conf
 crtlocalec () {
-sed -i "s/en_US/"${LCLST}"/g" ./arch_skel/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
+#sed -i "s/en_US/"${LCLST}"/g" ./arch_skel/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
 echo "LANG="${LCLST}".UTF-8" > ./arch_skel/airootfs/etc/locale.conf
+echo ""${LCLST}".UTF-8 UTF-8" > ./arch_skel/airootfs/etc/locale.gen
 }
 
 # Start mkarchiso
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/branding.desc b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/branding.desc
index 1f566e1..632e696 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/branding.desc
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/branding.desc
@@ -123,10 +123,10 @@ navigation: widget
 strings:
     productName:         LinHES
     shortProductName:    LinHES
-    version:             9alpha1
-    shortVersion:        9alpha1
-    versionedName:       LinHES
-    shortVersionedName:  LinHES
+    version:             R9.0.0
+    shortVersion:        9.0.0
+    versionedName:       LinHES R9.0.0 (Been a minute...)
+    shortVersionedName:  LinHES R9.0.0
     bootloaderEntryName: LinHES9
 
 # These images are loaded from the branding module directory.
@@ -163,24 +163,6 @@ images:
     # productWallpaper:    "wallpaper.png"
     # productWelcome:      ""
 
-# 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.
-#
-# These colors can **also** be set through the stylesheet, if the
-# branding component also ships a stylesheet.qss. Then they are
-# the corresponding CSS attributes of #sidebarApp.
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-#   sidebarTextSelect:    "#292F34"
-   sidebarTextSelect:    "#EBB81C"
-   sidebarTextHighlight: "#0072BC"
-
 ### SLIDESHOW
 #
 # The slideshow is displayed during execution steps (e.g. when the
@@ -215,14 +197,19 @@ slideshow:               "show.qml"
 slideshowAPI: 2
 
 
-# These options are to customize online uploading of logs to pastebins:
-#  - type : Defines the kind of pastebin service to be used. Currently
-#           it accepts two values:
-#           - none    :    disables the pastebin functionality
-#           - fiche   :    use fiche pastebin server
-#  - url  : Defines the address of pastebin service to be used.
-#           Takes string as input. Important bits are the host and port,
-#           the scheme is not used.
-uploadServer :
-    type :    "fiche"
-    url :     "http://termbin.com:9999"
+# 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.
+#
+# These colors can **also** be set through the stylesheet, if the
+# branding component also ships a stylesheet.qss. Then they are
+# the corresponding CSS attributes of #sidebarApp.
+style:
+   SidebarBackground:        "#292F34"
+   SidebarText:              "#808080"
+   SidebarTextCurrent:       "#EBB81C"
+   SidebarBackgroundCurrent: "#0072BC"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/show.qml b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/show.qml
index b0632dc..26f9981 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/show.qml
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/show.qml
@@ -1,13 +1,5 @@
-/* === This file is part of Calamares - <https://calamares.io> ===
- *
- *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
- *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
+/* SPDX-FileCopyrightText: 2020 Oliver Smith <ollieparanoid@postmarketos.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 import QtQuick 2.0;
 import calamares.slideshow 1.0;
 
@@ -15,83 +7,24 @@ Presentation
 {
     id: presentation
 
-    function nextSlide() {
-        console.log("QML Component (default slideshow) Next slide");
-        presentation.goToNextSlide();
-    }
-
-    Timer {
-        id: advanceTimer
-        interval: 5000
-        running: presentation.activatedInCalamares
-        repeat: true
-        onTriggered: nextSlide()
-    }
-
-    Slide {
-
-    anchors.fill: parent
-    anchors.verticalCenterOffset: 0
-
-    Image {
-        id: background1
-        source: ""
-        width: parent.width; height: parent.height
-        horizontalAlignment: Image.AlignCenter
-        verticalAlignment: Image.AlignTop
-        fillMode: Image.Stretch
-        anchors.fill: parent
-    	}
-
-    Text {
-        anchors.horizontalCenter: background.horizontalCenter
-        anchors.top: background.bottom
-        text: "Welcome to"
-        wrapMode: Text.WordWrap
-        width: presentation.width
-        horizontalAlignment: Text.Center
-    	}
-    }
-
     Slide {
-
-    anchors.fill: parent
-    anchors.verticalCenterOffset: 0
-
-    Image {
-        id: background2
-        source: ""
-        width: parent.width; height: parent.height
-        horizontalAlignment: Image.AlignCenter
-        verticalAlignment: Image.AlignTop
-        fillMode: Image.Stretch
-        anchors.fill: parent
-    	}
-
-    Text {
-        anchors.horizontalCenter: background.horizontalCenter
-        anchors.top: background.bottom
-        text: "LinHES: The Linux Entertainment System"
-        wrapMode: Text.WordWrap
-        width: presentation.width
-        horizontalAlignment: Text.Center
-    	}
-    }
-
-
-    // When this slideshow is loaded as a V1 slideshow, only
-    // activatedInCalamares is set, which starts the timer (see above).
-    //
-    // In V2, also the onActivate() and onLeave() methods are called.
-    // These example functions log a message (and re-start the slides
-    // from the first).
-    function onActivate() {
-        console.log("QML Component (default slideshow) activated");
-        presentation.currentSlide = 0;
+        Image {
+            id: background
+            source: "squid.png"
+            width: parent.width; height: parent.height
+            horizontalAlignment: Image.AlignCenter
+            verticalAlignment: Image.AlignTop
+            fillMode: Image.PreserveAspectFit
+            anchors.centerIn: parent
+        }
+
+        Text {
+            anchors.horizontalCenter: background.horizontalCenter
+            anchors.top: background.bottom
+            text: "Installing LinHES R9.0.0"
+            wrapMode: Text.WordWrap
+            width: presentation.width
+            horizontalAlignment: Text.Center
+        }
     }
-
-    function onLeave() {
-        console.log("QML Component (default slideshow) deactivated");
-    }
-
 }
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/stylesheet.qss b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/stylesheet.qss
index d3d0c2d..8f938ab 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/stylesheet.qss
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/branding/LinHES/stylesheet.qss
@@ -59,6 +59,7 @@ QAbstractSpinBox {
 QListWidget::item:alternate {
 }
 
+QPushButton#aboutButton { qproperty-icon: url(:/data/images/release.svg); color: #FFFFFF; }
 
 #debugButton {
 	font: bold 8px;
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/bootloader.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/bootloader.conf
new file mode 100644
index 0000000..80e0458
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/bootloader.conf
@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the bootloader module.
+# 
+---
+
+efiBootLoader: "grub"
+
+kernel: "/vmlinuz-linux"
+img: "/initramfs-linux.img"
+fallback: "/initramfs-linux-fallback.img"
+timeout: "5"
+
+efiBootloaderId: "linhes"
+
+grubInstall: "grub-install"
+grubMkconfig: "grub-mkconfig"
+grubCfg: "/boot/grub/grub.cfg"
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"
+
+installEFIFallback: true
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/displaymanager.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/displaymanager.conf
new file mode 100644
index 0000000..d786b81
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/displaymanager.conf
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the displaymanager module.
+#
+---
+
+displaymanagers:
+  - sddm
+
+basicSetup: false
+
+sysconfigSetup: false
+
+sddm:
+  configuration_file: "/etc/sddm.conf"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/fstab.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/fstab.conf
new file mode 100644
index 0000000..f8d625a
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/fstab.conf
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the fstab module.
+#
+---
+
+crypttabOptions: luks
+
+tmpOptions:
+    default:
+        tmpfs: false
+        options: ""
+    ssd:
+        tmpfs: true
+        options: "defaults,noatime,mode=1777"
+
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/grubcfg.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/grubcfg.conf
new file mode 100644
index 0000000..6b297f3
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/grubcfg.conf
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the grugcfg module.
+#
+---
+
+overwrite: false
+
+prefer_grub_d: false
+
+keepDistributor: false
+
+defaults:
+    GRUB_TIMEOUT: 5
+    GRUB_DEFAULT: "saved"
+    GRUB_DISABLE_SUBMENU: true
+    GRUB_TERMINAL_OUTPUT: "console"
+    GRUB_DISABLE_RECOVERY: true
+
+always_use_defaults: false
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/initcpiocfg.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/initcpiocfg.conf
new file mode 100644
index 0000000..f02898f
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/initcpiocfg.conf
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# The initcpiocfg module is responsible for the configuration of mkinitcpio.conf.  Typically this
+# module is used in conjunction with the initcpio module to generate the boot image when using mkinitcpio
+#
+---
+
+useSystemdHook: false
+
+source: "/etc/mkinitcpio.conf"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/keyboard.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/keyboard.conf
new file mode 100644
index 0000000..e51debc
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/keyboard.conf
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the keyboard module.
+#
+---
+
+xOrgConfFileName: "/etc/X11/xorg.conf.d/00-keyboard.conf"
+
+convertedKeymapPath: "/lib/kbd/keymaps/xkb"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/locale.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/locale.conf
new file mode 100644
index 0000000..cfeca78
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/locale.conf
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the locale module.
+#
+---
+
+region:                     ""
+zone:                       ""
+
+geoip:
+    style:    "json"
+    url:      "https://geoip.kde.org/v1/calamares"
+    selector: ""  # leave blank for the default
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/luksopenswaphookcfg.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/luksopenswaphookcfg.conf
new file mode 100644
index 0000000..1ec7e5b
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/luksopenswaphookcfg.conf
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Writes an openswap configuration with LUKS settings to the given path
+#
+---
+
+configFilePath: /etc/openswap.conf
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/machineid.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/machineid.conf
new file mode 100644
index 0000000..a9719a3
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/machineid.conf
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Machine-ID and other random data on the target system.
+#
+---
+
+systemd: true
+
+systemd-style: uuid
+
+dbus: true
+
+dbus-symlink: true
+
+entropy-copy: false
+
+entropy-files:
+    - /var/lib/urandom/random-seed
+    - /var/lib/systemd/random-seed
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/mount.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/mount.conf
new file mode 100644
index 0000000..c60aed5
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/mount.conf
@@ -0,0 +1,52 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the mount module.
+# 
+---
+
+extraMounts:
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: [ bind ]
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: [ bind ]
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars
+      efi: true
+
+btrfsSubvolumes:
+    - mountPoint: /
+      subvolume: /@
+    - mountPoint: /home
+      subvolume: /@home
+    - mountPoint: /var/cache
+      subvolume: /@cache
+    - mountPoint: /var/log
+      subvolume: /@log
+
+btrfsSwapSubvol: /@swap
+
+mountOptions:
+    - filesystem: default
+      options: [ defaults ]
+    - filesystem: efi
+      options: [ defaults, umask=0077 ]
+    - filesystem: ext4
+      options: [ defaults, noatime, nodiscard ]
+    - filesystem: btrfs
+      options: [ defaults, noatime, nodiscard, noautodefrag ]
+      ssdOptions: [ ssd ]
+    - filesystem: btrfs_swap
+      options: [ defaults, noatime ]
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/partition.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/partition.conf
index e9425ad..262f8ee 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/partition.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/partition.conf
@@ -1,255 +1,43 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 #
-# This setting specifies the mount point of the EFI system partition. Some
-# distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS,
-# etc.) use just /boot.
+# Configuration for the partition module.
 #
-# Defaults to "/boot/efi", may be empty (but weird effects ensue)
-efiSystemPartition:     "/boot/efi"
+---
 
-# This optional setting specifies the size of the EFI system partition.
-# If nothing is specified, the default size of 300MiB will be used.
-#
-# This size applies both to automatic partitioning and the checks
-# during manual partitioning. A minimum of 32MiB is enforced,
-# 300MiB is the default, M is treated as MiB, and if you really want
-# one-million (10^6) bytes, use MB.
-#
-# efiSystemPartitionSize:     300M
-
-# This optional setting specifies the name of the EFI system partition (see
-# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
-# If nothing is specified, the partition name is left unset.
-# efiSystemPartitionName:     EFI
+efi:
+    mountPoint:         "/efi"
+    recommendedSize:    1024MiB
+    minimumSize:        1024MiB
+    label:              "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
-# one choice, a UI is presented.
-#
-# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
-# to values of *userSwapChoices* as follows:
-#    - *neverCreateSwap* is true, means [none]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
-#
-# Autogenerated swap sizes are as follows:
-#    - *suspend*: Swap is always at least total memory size,
-#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
-#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
-#      swap is the size of main memory.
-#    - *small*: Follows the rules above, but Swap is at
-#      most 8GiB, and no more than 10% of available disk.
-# In both cases, a fudge factor (usually 10% extra) is applied so that there
-# is some space for administrative overhead (e.g. 8 GiB swap will allocate
-# 8.8GiB on disk in the end).
-#
-# If *file* is enabled here, make sure to have the *fstab* module
-# 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
+swapPartitionName:      SWAP
 
-# LEGACY SETTINGS (these will generate a warning)
-# ensureSuspendToDisk:    true
-# neverCreateSwap:        false
+luksGeneration: luks1
 
-# Correctly draw nested (e.g. logical) partitions as such.
 drawNestedPartitions:   false
 
-# Show/hide partition labels on manual partitioning page.
 alwaysShowPartitionLabels: true
 
-# Allow manual partitioning.
-#
-# When set to false, this option hides the "Manual partitioning" button,
-# limiting the user's choice to "Erase", "Replace" or "Alongside".
-# This can be useful when using a custom partition layout we don't want
-# the user to modify.
-#
-# If nothing is specified, manual partitioning is enabled.
-#allowManualPartitioning:   true
+allowManualPartitioning:   true
+
+showNotEncryptedBootMessage:   true
 
-# Initial selection on the Choice page
-#
-# There are four radio buttons (in principle: erase, replace, alongside, manual),
-# and you can pick which of them, if any, is initially selected. For most
-# installers, "none" is the right choice: it makes the user pick something specific,
-# rather than accidentally being able to click past an important choice (in particular,
-# "erase" is a dangerous choice).
-#
-# The default is "none"
-#
 initialPartitioningChoice: none
-#
-# Similarly, some of the installation choices may offer a choice of swap;
-# the available choices depend on *userSwapChoices*, above, and this
-# setting can be used to pick a specific one.
-#
-# The default is "none" (no swap) if that is one of the enabled options, otherwise
-# one of the items from the options.
-initialSwapChoice: none
 
-# 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
+initialSwapChoice: file
 
-# Requirement for partition table type
-#
-# Restrict the installation on disks that match the type of partition
-# tables that are specified.
-#
-# Possible values: msdos, gpt. Names are case-sensitive and defined by KPMCore.
+# If nothing is specified, Calamares defaults to "gpt" if
+# system is efi or "msdos" otherwise
 #
-# If nothing is specified, Calamares defaults to both "msdos" and "gpt".
-#
-# requiredPartitionTableType: gpt
-# requiredPartitionTableType:
-#     - msdos
-#     - gpt
+# defaultPartitionTableType: msdos
 
-# Default filesystem type, used when a "new" partition is made.
-#
-# When replacing a partition, the existing filesystem inside the
-# partition is retained. 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","ext3","btrfs","f2fs","jfs","reiser","xfs"]
-
-# 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.
-#
-# This optional setting specifies a custom partition layout.
-#
-# If nothing is specified, the default partition layout is a single partition
-# for root that uses 100% of the space and uses the filesystem defined by
-# defaultFileSystemType.
-#
-# Note: the EFI system partition is prepend automatically to the layout if
-# needed; the swap partition is appended to the layout if enabled (small of
-# suspend).
-#
-# Otherwise, the partition layout is defined as follow:
-#
-# partitionLayout:
-#     - name: "rootfs"
-#       type: "4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
-#       filesystem: "ext4"
-#       mountPoint: "/"
-#       size: 20%
-#       minSize: 500M
-#       maxSize: 10G
-#       attributes: 0xffff000000000003
-#     - name: "home"
-#       type: "933ac7e1-2eb4-4f13-b844-0e14e2aef915"
-#       filesystem: "ext4"
-#       mountPoint: "/home"
-#       size: 3G
-#       minSize: 1.5G
-#       features:
-#         64bit: false
-#         casefold: true
-#     - name: "data"
-#       filesystem: "fat32"
-#       mountPoint: "/data"
-#       features:
-#         sector-size: 4096
-#         sectors-per-cluster: 128
-#       size: 100%
-#
-# There can be any number of partitions, each entry having the following attributes:
-#   - name: filesystem label
-#           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).
-#   - 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
+availableFileSystemTypes:  ["ext4","btrfs","xfs"]
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/services-systemd.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/services-systemd.conf
new file mode 100644
index 0000000..be9ad91
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/services-systemd.conf
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Systemd services manipulation.
+#
+---
+
+units:
+   - name: "systemd-networkd.service"
+     action: "disable" 
+   - name: "avahi-daemon.service"
+     action: "enable" 
+   - name: "fstrim.timer"
+     action: "enable" 
+   - name: "plocate-updatedb.timer"
+     action: "enable" 
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-before.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-before.conf
index aaf0243..c3fd7ab 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-before.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-before.conf
@@ -75,4 +75,6 @@ timeout: 999
 # other commands in the list):
 script:
     - "-/usr/bin/pacman-key --init"
-    - "-/usr/bin/pacman-key --populate"
\ No newline at end of file
+    - "-/usr/bin/pacman-key --populate"
+    - "-rm ${ROOT}/etc/skel/Desktop/calamares.desktop"
+    - "-rm ${ROOT}/etc/skel/.config/autostart/calamares.desktop"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-final.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-final.conf
index 65be5e1..7884d95 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-final.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/shellprocess-final.conf
@@ -51,6 +51,10 @@
 #
 # To change the description of the job, set the *name* entries in *i18n*.
 ---
+
+i18n:
+    name: "Cleanup new install files."
+
 # Set to true to run in host, rather than target system
 dontChroot: false
 # Tune this for the commands you're actually running
@@ -74,12 +78,15 @@ timeout: 999
 # ignored; the slowloris command has a different timeout from the
 # other commands in the list):
 script:
-    - "-rm @@ROOT@@/etc/sudoers.d/g_wheel"
-    - "-rm -r @@ROOT@@/etc/systemd/system/getty@tty1.service.d"
-    - "-rm -r @@ROOT@@/etc/systemd/system/multi-user.target.wants/pacman-init.service"
-    - "-rm -r @@ROOT@@/etc/systemd/system/pacman-init.service"
-    - "-rm @@ROOT@@/etc/systemd/system/etc-pacman.d-gnupg.mount"
-    - "-rm @@ROOT@@/root/.automated_script.sh"
-    - "-rm @@ROOT@@/root/.zlogin"
-    - "-rm @@ROOT@@/etc/polkit-1/rules.d/49-nopasswd_global.rules"
-#    - "-rm @@ROOT@@/etc/systemd/system/display-manager.service"
+    - "-rm ${ROOT}etc/sudoers.d/g_wheel"
+    - "-rm -r ${ROOT}etc/systemd/system/getty@tty1.service.d"
+    - "-rm -r ${ROOT}etc/systemd/system/multi-user.target.wants/pacman-init.service"
+    - "-rm -r ${ROOT}etc/systemd/system/pacman-init.service"
+    - "-rm ${ROOT}etc/systemd/system/etc-pacman.d-gnupg.mount"
+    - "-rm ${ROOT}root/.automated_script.sh"
+    - "-rm ${ROOT}root/.zlogin"
+    - "-rm -r ${ROOT}etc/calamares/"
+    - "-rm -r ${ROOT}etc/systemd/system/locale-gen.service"
+    - "-rm ${ROOT}etc/polkit-1/rules.d/49-nopasswd_global.rules"
+    - "-rm ${ROOT}etc/sddm.conf"
+    - "sed -i 's/User=km/User=${USER}/g' ${ROOT}etc/sddm.conf.d/autologin.conf"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/users.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/users.conf
index 19531a8..09b83a8 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/users.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/modules/users.conf
@@ -32,7 +32,9 @@ defaultGroups:
     - name: users
       must_exist: true
       system: true
+    - adm
     - lp
+    - power
     - video
     - network
     - storage
@@ -40,6 +42,12 @@ defaultGroups:
       must_exist: false
       system: true
     - audio
+    - sys
+    - optical
+    - scanner
+    - rfkill
+    - uucp
+    - sambashare
 
 # Some Distributions require a 'autologin' group for the user.
 # Autologin causes a user to become automatically logged in to
@@ -161,6 +169,7 @@ allowWeakPasswordsDefault: true
 user:
   shell: /bin/bash
   forbidden_names: [ root ]
+  home_permissions: "0700"
 
 # Hostname settings
 #
@@ -205,7 +214,7 @@ user:
 hostname:
   location: EtcFile
   writeHostsFile: true
-  #template: "alci-${cpu}"
+  template: "${first}-${product}"
   forbidden_names: [ localhost ]
 
 presets:
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/settings.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/settings.conf
index e7cba3e..60f34f2 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/settings.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/calamares/settings.conf
@@ -3,115 +3,9 @@
 #
 # Configuration file for Calamares
 #
-# This is the top-level configuration file for Calamares.
-# It specifies what modules will be used, as well as some
-# overall characteristics -- is this a setup program, or
-# an installer. More specific configuration is devolved
-# to the branding file (for the UI) and the individual
-# module configuration files (for functionality).
 ---
-# 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 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:       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.
+modules-search: [ local ]
 
 instances:
 - id:       before
@@ -125,119 +19,52 @@ instances:
 sequence:
 - show:
   - welcome
-#  - notesqml
   - locale
   - keyboard
   - partition
   - users
-#  - tracking
   - summary
 - exec:
   - partition
-#  - zfs
   - mount
   - unpackfs
   - machineid
-  - fstab
   - locale
   - keyboard
   - localecfg
   - luksbootkeyfile
   - luksopenswaphookcfg
+  - fstab
   - initcpiocfg
   - initcpio
   - removeuser
+  - shellprocess@before
   - users
-  - displaymanager
   - networkcfg
-  - hwclock
-#  - services-systemd
-  - shellprocess@before
+  - displaymanager
   - packages
+  - hwclock
+  - services-systemd
   - grubcfg
   - bootloader
   - shellprocess@final
   - preservefiles
   - umount
 - show:
-#  - webview@owncloud
   - 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
-# (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: LinHES
 
-# If this is set to true, Calamares will show an "Are you sure?" prompt right
-# 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: false
 
-# 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
 
-# If this is set to true, the "Next" and "Back" button will be hidden once
-# you start the 'Installation'.
-#
-# Default is false, but Calamares will complain if this is not explicitly set.
-#
-# YAML: boolean.
 hide-back-and-next-during-exec: false
 
-# If this is set to true, then once the end of the sequence has
-# been reached, the quit (done) button is clicked automatically
-# and Calamares will close. Default is false: the user will see
-# that the end of installation has been reached, and that things are ok.
-#
-#
 quit-at-end: false
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/dkms/framework.conf.d/signkeyfile.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/dkms/framework.conf.d/signkeyfile.conf
new file mode 100644
index 0000000..8e19713
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/dkms/framework.conf.d/signkeyfile.conf
@@ -0,0 +1,2 @@
+# Location of the sign-file kernel binary (default: depends on distributioin):
+sign_file='/usr/lib/modules/${kernelver}/build/scripts/sign-file'
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/lightdm/lightdm.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/lightdm/lightdm.conf
deleted file mode 100644
index f43b26c..0000000
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,164 +0,0 @@
-[Seat:*]
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-# dbus-service = True if LightDM provides a D-Bus service to control it
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-run-directory=/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
-#backup-logs=true
-#dbus-service=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (local, xremote)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=local
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-greeter-session=lightdm-gtk-greeter
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-user-session=xfce
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-session-wrapper=/etc/lightdm/Xsession
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
-#autologin-guest=false
-autologin-user=km
-#autologin-user-timeout=0
-#autologin-in-background=false
-autologin-session=xfce
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/pacman.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/pacman.conf
index cb24f8c..03c2137 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/pacman.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/pacman.conf
@@ -32,10 +32,11 @@ Architecture = auto
 #UseSyslog
 #Color
 #NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 ParallelDownloads = 5
+DownloadUser = alpm
+#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -70,19 +71,24 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[testing]
+[linhes-testing]
+SigLevel = Optional TrustAll
+Server = http://linhes.org/repo/$arch/$repo/
+
+#[linhes]
+#SigLevel = Optional TrustAll
+#Server = http://linhes.org/repo/$arch/$repo/
+
+#[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
@@ -99,7 +105,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-[linhes-testing]
-SigLevel = Optional TrustAll
-Server = http://linhes.org/repo/$arch/$repo/
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/autologin.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/autologin.conf
index 6ed2275..5330a6b 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/autologin.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/autologin.conf
@@ -1,3 +1,3 @@
 [Autologin]
 User=km
-Session=plasma
+Session=plasmax11
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/theme.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/theme.conf
new file mode 100644
index 0000000..d1fea99
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sddm.conf.d/theme.conf
@@ -0,0 +1,6 @@
+[General]
+Numlock=on
+[Theme]
+Current=breeze
+CursorTheme=breeze_cursors
+Font=Noto Sans,10,-1,0,400,0,0,0,0,0,0,0,0,0,0,1
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop
deleted file mode 100755
index 5d3405c..0000000
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop
+++ /dev/null
@@ -1,252 +0,0 @@
-[Desktop Entry]
-Categories=Qt;System;
-Comment[en_US]=Calamares — System Installer
-Comment=Calamares — System Installer
-Comment[ar]=كالامارس - مثبت النظام
-Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ
-Comment[ast]=Calamares — Instalador del sistema
-Comment[az]=Calamares Sistem Quraşdırıcısı
-Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı
-Comment[be]=Calamares — усталёўшчык сістэмы
-Comment[bg]=„Calamares“ – Системен инсталатор
-Comment[bn]=ক্যালামারেস - সিস্টেম ইনস্টলার
-Comment[ca]=Calamares — Instal·lador de sistema
-Comment[cs_CZ]=Calamares – instalátor operačních systémů
-Comment[da]=Calamares — Systeminstallationsprogram
-Comment[de]=Calamares - Installation des Betriebssystems
-Comment[el]=Calamares — Εγκατάσταση συστήματος
-Comment[en_GB]=Calamares — System Installer
-Comment[eo]=Calamares — Sistema Instalilo
-Comment[es]=Calamares — Instalador del sistema
-Comment[es_MX]=Calamares - Instalador del sistema
-Comment[et]=Calamares — süsteemipaigaldaja
-Comment[eu]=Calamares - sistema instalatzailea
-Comment[fa]=کالامارس — نصب‌کننده سامانه
-Comment[fi_FI]=Calamares — Järjestelmän asentaja
-Comment[fr]=Calamares - Installateur système
-Comment[fur]=Calamares — Program di instalazion dal sisteme
-Comment[gl]=Calamares — Instalador de sistemas
-Comment[he]=Calamares - אשף התקנה
-Comment[hi]=Calamares — सिस्टम इंस्टॉलर
-Comment[hr]=Calamares — Instalacija sustava
-Comment[hu]=Calamares – Rendszertelepítő
-Comment[id]=Calamares — Pemasang Sistem
-Comment[ie]=Calamares — Installator del sistema
-Comment[is]=Calamares — Kerfis uppsetning
-Comment[it_IT]=Calamares — Programma d'installazione del sistema
-Comment[ja]=Calamares — システムインストーラー
-Comment[ko]=깔라마레스 — 시스템 설치 관리자
-Comment[lt]=Calamares — Sistemos diegimo programa
-Comment[mk]=Calamares - Системен Инсталер
-Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
-Comment[nb]=Calamares-systeminstallatør
-Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर
-Comment[nl]=Calamares — Installatieprogramma
-Comment[pl]=Calamares — Instalator systemu
-Comment[pt_BR]=Calamares — Instalador de Sistema
-Comment[pt_PT]=Instalador de Sistema - Calamares
-Comment[ro]=Calamares — Instalator de sistem
-Comment[ru]=Calamares - Установщик системы
-Comment[si]=Calamares - පද්ධති ස්ථාපකය
-Comment[sk]=Calamares — Inštalátor systému
-Comment[sq]=Calamares — Instalues Sistemi
-Comment[sr]=Каламарес — инсталатер система
-Comment[sv]=Calamares — Systeminstallerare
-Comment[tg]=Calamares — Насбкунандаи низомӣ
-Comment[tr_TR]=Calamares — Sistem Yükleyici
-Comment[uk]=Calamares - Встановлювач системи
-Comment[vi]=Calamares — Bộ cài đặt hệ thống
-Comment[zh_CN]=Calamares — 系统安装程序
-Comment[zh_TW]=Calamares ── 系統安裝程式
-Exec=sh /usr/bin/calamares_polkit %f
-GenericName[en_US]=System Installer
-GenericName=System Installer
-GenericName[ar]=مثبت النظام
-GenericName[as]=চিছটেম ইনস্তলাৰ
-GenericName[ast]=Instalador del sistema
-GenericName[az]=Sistem Quraşdırıcısı
-GenericName[az_AZ]=Sistem quraşdırcısı
-GenericName[be]=Усталёўшчык сістэмы
-GenericName[bg]=Системен инсталатор
-GenericName[bn]=সিস্টেম ইনস্টলার
-GenericName[ca]=Instal·lador de sistema
-GenericName[cs_CZ]=Instalátor systému
-GenericName[da]=Systeminstallationsprogram
-GenericName[de]=Installation des Betriebssystems
-GenericName[el]=Εγκατάσταση συστήματος
-GenericName[en_GB]=System Installer
-GenericName[eo]=Sistema Instalilo
-GenericName[es]=Instalador del sistema
-GenericName[es_MX]=Instalador del sistema
-GenericName[et]=Süsteemipaigaldaja
-GenericName[eu]=Sistema instalatzailea
-GenericName[fa]=نصب‌کننده سامانه
-GenericName[fi_FI]=Järjestelmän asennusohjelma
-GenericName[fr]=Installateur système
-GenericName[fur]=Program di instalazion dal sisteme
-GenericName[gl]=Instalador de sistemas
-GenericName[he]=אשף התקנה
-GenericName[hi]=सिस्टम इंस्टॉलर
-GenericName[hr]=Instalacija sustava
-GenericName[hu]=Rendszertelepítő
-GenericName[id]=Pemasang
-GenericName[ie]=Installator del sistema
-GenericName[is]=Kerfis uppsetning
-GenericName[it_IT]=Programma d'installazione del sistema
-GenericName[ja]=システムインストーラー
-GenericName[ko]=시스템 설치 관리자
-GenericName[lt]=Sistemos diegimas į kompiuterį
-GenericName[mk]=Системен Инсталер
-GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
-GenericName[nb]=Systeminstallatør
-GenericName[ne_NP]=सिस्टम इन्स्टलर
-GenericName[nl]=Installatieprogramma
-GenericName[pl]=Instalator systemu
-GenericName[pt_BR]=Instalador de Sistema
-GenericName[pt_PT]=Instalador de Sistema
-GenericName[ro]=Instalator de sistem
-GenericName[ru]=Установщик системы
-GenericName[si]=පද්ධති ස්ථාපකය
-GenericName[sk]=Inštalátor systému
-GenericName[sq]=Instalues Sistemi
-GenericName[sr]=Инсталатер система
-GenericName[sv]=Systeminstallerare
-GenericName[tg]=Насбкунандаи низомӣ
-GenericName[tr_TR]=Sistem Yükleyici
-GenericName[uk]=Встановлювач системи
-GenericName[vi]=Bộ cài đặt hệ thống
-GenericName[zh_CN]=系统安装程序
-GenericName[zh_TW]=系統安裝程式
-Icon=qvidcap
-Icon[ar]=كالامارس
-Icon[as]=কেলামাৰেচ
-Icon[ast]=calamares
-Icon[az]=calamares
-Icon[az_AZ]=calamares
-Icon[be]=calamares
-Icon[bg]=calamares
-Icon[bn]=ক্যালামারেস
-Icon[ca]=calamares
-Icon[cs_CZ]=calamares
-Icon[da]=calamares
-Icon[de]=calamares
-Icon[el]=calamares
-Icon[en_GB]=calamares
-Icon[eo]=calamares
-Icon[es]=calamares
-Icon[es_MX]=calamares
-Icon[et]=calamares
-Icon[eu]=calamares
-Icon[fa]=کالامارس
-Icon[fi_FI]=calamares
-Icon[fr]=calamares
-Icon[fur]=calamares
-Icon[gl]=calamares
-Icon[he]=calamares
-Icon[hi]=calamares
-Icon[hr]=calamares
-Icon[hu]=calamares
-Icon[id]=calamares
-Icon[ie]=calamares
-Icon[is]=calamares
-Icon[it_IT]=calamares
-Icon[ja]=calamares
-Icon[ko]=깔라마레스
-Icon[lt]=calamares
-Icon[mk]=calamares
-Icon[ml]=കലാമാരേസ്
-Icon[nb]=calamares
-Icon[ne_NP]=Calamares
-Icon[nl]=calamares
-Icon[pl]=calamares
-Icon[pt_BR]=calamares
-Icon[pt_PT]=calamares
-Icon[ro]=calamares
-Icon[ru]=calamares
-Icon[si]=කැලමරේස්
-Icon[sk]=calamares
-Icon[sq]=calamares
-Icon[sr]=calamares
-Icon[sv]=calamares
-Icon[tg]=calamares
-Icon[tr_TR]=calamares
-Icon[uk]=calamares
-Icon[vi]=calamares
-Icon[zh_CN]=calamares
-Icon[zh_TW]=calamares
-Keywords=calamares;system;installer;
-MimeType=
-Name[en_US]=Install LinHES
-Name=Install LinHES
-Name[ar]=تثبيت النظام
-Name[as]=চিছটেম ইনস্তল কৰক
-Name[ast]=Instalar el sistema
-Name[az]=Sistemi Quraşdırmaq
-Name[az_AZ]=Sistemi quraşdırmaq
-Name[be]=Усталяваць сістэму
-Name[bg]=Инсталирай системата
-Name[bn]=সিস্টেম ইনস্টল করুন
-Name[ca]=Instal·la el sistema
-Name[cs_CZ]=Nainstalovat systém
-Name[da]=Installér system
-Name[de]=System installieren
-Name[el]=Εγκατάσταση συστήματος
-Name[en_GB]=Install System
-Name[eo]=Instali Sistemo
-Name[es]=Instalar el sistema
-Name[es_MX]=Instalar el Sistema
-Name[es_PR]=Instalar el sistema
-Name[et]=Paigalda süsteem
-Name[eu]=Sistema instalatu
-Name[fa]=نصب سامانه
-Name[fi_FI]=Asenna järjestelmä
-Name[fr]=Installer le système
-Name[fur]=Instale il sisteme
-Name[gl]=Instalación do Sistema
-Name[he]=התקנת מערכת
-Name[hi]=सिस्टम इंस्टॉल करें
-Name[hr]=Instaliraj sustav
-Name[hu]=Rendszer telepítése
-Name[id]=Instal Sistem
-Name[ie]=Installar li sistema
-Name[is]=Setja upp kerfið
-Name[it_IT]=Installa il sistema
-Name[ja]=システムをインストール
-Name[ko]=시스템 설치
-Name[lt]=Įdiegti Sistemą
-Name[mk]=Инсталирај го системот
-Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യുക
-Name[nb]=Installer System
-Name[ne_NP]=सिस्टम इन्स्टल गर्नुहोस्
-Name[nl]=Installeer systeem
-Name[pl]=Zainstaluj system
-Name[pt_BR]=Sistema de Instalação
-Name[pt_PT]=Instalar Sistema
-Name[ro]=Instalează sistemul
-Name[ru]=Установить систему
-Name[si]=පද්ධතිය ස්ථාපනය කරන්න
-Name[sk]=Inštalovať systém
-Name[sl]=Namesti sistem
-Name[sq]=Instalo Sistemin
-Name[sr@latin]=Instaliraj sistem
-Name[sr]=Инсталирај систем
-Name[sv]=Installera system
-Name[tg]=Насбкунии низом
-Name[th]=ติดตั้งระบบ
-Name[tr_TR]=Sistemi Yükle
-Name[uk]=Встановити Систему
-Name[vi]=Cài đặt hệ thống
-Name[zh_CN]=安装系统
-Name[zh_TW]=安裝系統
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
-TryExec=calamares
-Type=Application
-Version=1.0
-X-AppStream-Ignore=true
-X-DBUS-ServiceName=
-X-DBUS-StartupType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop
new file mode 120000
index 0000000..2a5b55f
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/autostart/calamares.desktop
@@ -0,0 +1 @@
+/usr/share/applications/calamares.desktop
\ No newline at end of file
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/powermanagementprofilesrc b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/powermanagementprofilesrc
new file mode 100644
index 0000000..658d9ec
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/.config/powermanagementprofilesrc
@@ -0,0 +1,5 @@
+[AC]
+icon=battery-charging
+
+[AC][DPMSControl]
+lockBeforeTurnOff=0
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/Desktop/calamares.desktop b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/Desktop/calamares.desktop
new file mode 120000
index 0000000..2a5b55f
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/skel/Desktop/calamares.desktop
@@ -0,0 +1 @@
+/usr/share/applications/calamares.desktop
\ No newline at end of file
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sudoers.d/g_wheel b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sudoers.d/g_wheel
new file mode 100644
index 0000000..bbad988
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/sudoers.d/g_wheel
@@ -0,0 +1 @@
+%wheel ALL=(ALL:ALL) NOPASSWD: ALL
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/systemd/system/locale-gen.service b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/systemd/system/locale-gen.service
new file mode 100644
index 0000000..c5920c9
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/etc/systemd/system/locale-gen.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Runs local-gen
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/locale-gen
+
+[Install]
+WantedBy=multi-user.target
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/root/customize_airootfs.sh b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/root/customize_airootfs.sh
deleted file mode 100755
index 521f3d8..0000000
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/root/customize_airootfs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-mkdir /home/km/Desktop
-cp /usr/share/LinHES/calamares.desktop /home/km/Desktop
-chmod +x /home/km/Desktop/calamares.desktop
-chown km:users /home/km/Desktop
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/bin/calamares_polkit b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/bin/calamares_polkit
deleted file mode 100755
index 9bce0f8..0000000
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/bin/calamares_polkit
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ $(which pkexec) ]; then
-	pkexec --disable-internal-agent "/usr/bin/calamares" "$@"
-else
-	/usr/bin/calamares "$@"
-fi
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/share/LinHES/calamares.desktop b/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/share/LinHES/calamares.desktop
deleted file mode 100755
index 5d3405c..0000000
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/airootfs/usr/share/LinHES/calamares.desktop
+++ /dev/null
@@ -1,252 +0,0 @@
-[Desktop Entry]
-Categories=Qt;System;
-Comment[en_US]=Calamares — System Installer
-Comment=Calamares — System Installer
-Comment[ar]=كالامارس - مثبت النظام
-Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ
-Comment[ast]=Calamares — Instalador del sistema
-Comment[az]=Calamares Sistem Quraşdırıcısı
-Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı
-Comment[be]=Calamares — усталёўшчык сістэмы
-Comment[bg]=„Calamares“ – Системен инсталатор
-Comment[bn]=ক্যালামারেস - সিস্টেম ইনস্টলার
-Comment[ca]=Calamares — Instal·lador de sistema
-Comment[cs_CZ]=Calamares – instalátor operačních systémů
-Comment[da]=Calamares — Systeminstallationsprogram
-Comment[de]=Calamares - Installation des Betriebssystems
-Comment[el]=Calamares — Εγκατάσταση συστήματος
-Comment[en_GB]=Calamares — System Installer
-Comment[eo]=Calamares — Sistema Instalilo
-Comment[es]=Calamares — Instalador del sistema
-Comment[es_MX]=Calamares - Instalador del sistema
-Comment[et]=Calamares — süsteemipaigaldaja
-Comment[eu]=Calamares - sistema instalatzailea
-Comment[fa]=کالامارس — نصب‌کننده سامانه
-Comment[fi_FI]=Calamares — Järjestelmän asentaja
-Comment[fr]=Calamares - Installateur système
-Comment[fur]=Calamares — Program di instalazion dal sisteme
-Comment[gl]=Calamares — Instalador de sistemas
-Comment[he]=Calamares - אשף התקנה
-Comment[hi]=Calamares — सिस्टम इंस्टॉलर
-Comment[hr]=Calamares — Instalacija sustava
-Comment[hu]=Calamares – Rendszertelepítő
-Comment[id]=Calamares — Pemasang Sistem
-Comment[ie]=Calamares — Installator del sistema
-Comment[is]=Calamares — Kerfis uppsetning
-Comment[it_IT]=Calamares — Programma d'installazione del sistema
-Comment[ja]=Calamares — システムインストーラー
-Comment[ko]=깔라마레스 — 시스템 설치 관리자
-Comment[lt]=Calamares — Sistemos diegimo programa
-Comment[mk]=Calamares - Системен Инсталер
-Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
-Comment[nb]=Calamares-systeminstallatør
-Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर
-Comment[nl]=Calamares — Installatieprogramma
-Comment[pl]=Calamares — Instalator systemu
-Comment[pt_BR]=Calamares — Instalador de Sistema
-Comment[pt_PT]=Instalador de Sistema - Calamares
-Comment[ro]=Calamares — Instalator de sistem
-Comment[ru]=Calamares - Установщик системы
-Comment[si]=Calamares - පද්ධති ස්ථාපකය
-Comment[sk]=Calamares — Inštalátor systému
-Comment[sq]=Calamares — Instalues Sistemi
-Comment[sr]=Каламарес — инсталатер система
-Comment[sv]=Calamares — Systeminstallerare
-Comment[tg]=Calamares — Насбкунандаи низомӣ
-Comment[tr_TR]=Calamares — Sistem Yükleyici
-Comment[uk]=Calamares - Встановлювач системи
-Comment[vi]=Calamares — Bộ cài đặt hệ thống
-Comment[zh_CN]=Calamares — 系统安装程序
-Comment[zh_TW]=Calamares ── 系統安裝程式
-Exec=sh /usr/bin/calamares_polkit %f
-GenericName[en_US]=System Installer
-GenericName=System Installer
-GenericName[ar]=مثبت النظام
-GenericName[as]=চিছটেম ইনস্তলাৰ
-GenericName[ast]=Instalador del sistema
-GenericName[az]=Sistem Quraşdırıcısı
-GenericName[az_AZ]=Sistem quraşdırcısı
-GenericName[be]=Усталёўшчык сістэмы
-GenericName[bg]=Системен инсталатор
-GenericName[bn]=সিস্টেম ইনস্টলার
-GenericName[ca]=Instal·lador de sistema
-GenericName[cs_CZ]=Instalátor systému
-GenericName[da]=Systeminstallationsprogram
-GenericName[de]=Installation des Betriebssystems
-GenericName[el]=Εγκατάσταση συστήματος
-GenericName[en_GB]=System Installer
-GenericName[eo]=Sistema Instalilo
-GenericName[es]=Instalador del sistema
-GenericName[es_MX]=Instalador del sistema
-GenericName[et]=Süsteemipaigaldaja
-GenericName[eu]=Sistema instalatzailea
-GenericName[fa]=نصب‌کننده سامانه
-GenericName[fi_FI]=Järjestelmän asennusohjelma
-GenericName[fr]=Installateur système
-GenericName[fur]=Program di instalazion dal sisteme
-GenericName[gl]=Instalador de sistemas
-GenericName[he]=אשף התקנה
-GenericName[hi]=सिस्टम इंस्टॉलर
-GenericName[hr]=Instalacija sustava
-GenericName[hu]=Rendszertelepítő
-GenericName[id]=Pemasang
-GenericName[ie]=Installator del sistema
-GenericName[is]=Kerfis uppsetning
-GenericName[it_IT]=Programma d'installazione del sistema
-GenericName[ja]=システムインストーラー
-GenericName[ko]=시스템 설치 관리자
-GenericName[lt]=Sistemos diegimas į kompiuterį
-GenericName[mk]=Системен Инсталер
-GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
-GenericName[nb]=Systeminstallatør
-GenericName[ne_NP]=सिस्टम इन्स्टलर
-GenericName[nl]=Installatieprogramma
-GenericName[pl]=Instalator systemu
-GenericName[pt_BR]=Instalador de Sistema
-GenericName[pt_PT]=Instalador de Sistema
-GenericName[ro]=Instalator de sistem
-GenericName[ru]=Установщик системы
-GenericName[si]=පද්ධති ස්ථාපකය
-GenericName[sk]=Inštalátor systému
-GenericName[sq]=Instalues Sistemi
-GenericName[sr]=Инсталатер система
-GenericName[sv]=Systeminstallerare
-GenericName[tg]=Насбкунандаи низомӣ
-GenericName[tr_TR]=Sistem Yükleyici
-GenericName[uk]=Встановлювач системи
-GenericName[vi]=Bộ cài đặt hệ thống
-GenericName[zh_CN]=系统安装程序
-GenericName[zh_TW]=系統安裝程式
-Icon=qvidcap
-Icon[ar]=كالامارس
-Icon[as]=কেলামাৰেচ
-Icon[ast]=calamares
-Icon[az]=calamares
-Icon[az_AZ]=calamares
-Icon[be]=calamares
-Icon[bg]=calamares
-Icon[bn]=ক্যালামারেস
-Icon[ca]=calamares
-Icon[cs_CZ]=calamares
-Icon[da]=calamares
-Icon[de]=calamares
-Icon[el]=calamares
-Icon[en_GB]=calamares
-Icon[eo]=calamares
-Icon[es]=calamares
-Icon[es_MX]=calamares
-Icon[et]=calamares
-Icon[eu]=calamares
-Icon[fa]=کالامارس
-Icon[fi_FI]=calamares
-Icon[fr]=calamares
-Icon[fur]=calamares
-Icon[gl]=calamares
-Icon[he]=calamares
-Icon[hi]=calamares
-Icon[hr]=calamares
-Icon[hu]=calamares
-Icon[id]=calamares
-Icon[ie]=calamares
-Icon[is]=calamares
-Icon[it_IT]=calamares
-Icon[ja]=calamares
-Icon[ko]=깔라마레스
-Icon[lt]=calamares
-Icon[mk]=calamares
-Icon[ml]=കലാമാരേസ്
-Icon[nb]=calamares
-Icon[ne_NP]=Calamares
-Icon[nl]=calamares
-Icon[pl]=calamares
-Icon[pt_BR]=calamares
-Icon[pt_PT]=calamares
-Icon[ro]=calamares
-Icon[ru]=calamares
-Icon[si]=කැලමරේස්
-Icon[sk]=calamares
-Icon[sq]=calamares
-Icon[sr]=calamares
-Icon[sv]=calamares
-Icon[tg]=calamares
-Icon[tr_TR]=calamares
-Icon[uk]=calamares
-Icon[vi]=calamares
-Icon[zh_CN]=calamares
-Icon[zh_TW]=calamares
-Keywords=calamares;system;installer;
-MimeType=
-Name[en_US]=Install LinHES
-Name=Install LinHES
-Name[ar]=تثبيت النظام
-Name[as]=চিছটেম ইনস্তল কৰক
-Name[ast]=Instalar el sistema
-Name[az]=Sistemi Quraşdırmaq
-Name[az_AZ]=Sistemi quraşdırmaq
-Name[be]=Усталяваць сістэму
-Name[bg]=Инсталирай системата
-Name[bn]=সিস্টেম ইনস্টল করুন
-Name[ca]=Instal·la el sistema
-Name[cs_CZ]=Nainstalovat systém
-Name[da]=Installér system
-Name[de]=System installieren
-Name[el]=Εγκατάσταση συστήματος
-Name[en_GB]=Install System
-Name[eo]=Instali Sistemo
-Name[es]=Instalar el sistema
-Name[es_MX]=Instalar el Sistema
-Name[es_PR]=Instalar el sistema
-Name[et]=Paigalda süsteem
-Name[eu]=Sistema instalatu
-Name[fa]=نصب سامانه
-Name[fi_FI]=Asenna järjestelmä
-Name[fr]=Installer le système
-Name[fur]=Instale il sisteme
-Name[gl]=Instalación do Sistema
-Name[he]=התקנת מערכת
-Name[hi]=सिस्टम इंस्टॉल करें
-Name[hr]=Instaliraj sustav
-Name[hu]=Rendszer telepítése
-Name[id]=Instal Sistem
-Name[ie]=Installar li sistema
-Name[is]=Setja upp kerfið
-Name[it_IT]=Installa il sistema
-Name[ja]=システムをインストール
-Name[ko]=시스템 설치
-Name[lt]=Įdiegti Sistemą
-Name[mk]=Инсталирај го системот
-Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യുക
-Name[nb]=Installer System
-Name[ne_NP]=सिस्टम इन्स्टल गर्नुहोस्
-Name[nl]=Installeer systeem
-Name[pl]=Zainstaluj system
-Name[pt_BR]=Sistema de Instalação
-Name[pt_PT]=Instalar Sistema
-Name[ro]=Instalează sistemul
-Name[ru]=Установить систему
-Name[si]=පද්ධතිය ස්ථාපනය කරන්න
-Name[sk]=Inštalovať systém
-Name[sl]=Namesti sistem
-Name[sq]=Instalo Sistemin
-Name[sr@latin]=Instaliraj sistem
-Name[sr]=Инсталирај систем
-Name[sv]=Installera system
-Name[tg]=Насбкунии низом
-Name[th]=ติดตั้งระบบ
-Name[tr_TR]=Sistemi Yükle
-Name[uk]=Встановити Систему
-Name[vi]=Cài đặt hệ thống
-Name[zh_CN]=安装系统
-Name[zh_TW]=安裝系統
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
-TryExec=calamares
-Type=Application
-Version=1.0
-X-AppStream-Ignore=true
-X-DBUS-ServiceName=
-X-DBUS-StartupType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index 6d50cc8..433e0b2 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -1,7 +1,5 @@
 title   LinHES (x86_64, UEFI)
 sort-key 01
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/intel-ucode.img
-initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=no
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
index a021e66..53a3a44 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
@@ -1,7 +1,5 @@
 title   LinHES (x86_64, UEFI) with speech
 sort-key 02
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/intel-ucode.img
-initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on cow_spacesize=4G copytoram=no
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf
new file mode 100644
index 0000000..75c257a
--- /dev/null
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf
@@ -0,0 +1,3 @@
+title   Memory Tester (memtest86+)
+sort-key 03
+efi     /boot/memtest86+/memtest.efi
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/grub/grub.cfg b/linhes/linhes-dev/LinHES9_iso/cust_skel/grub/grub.cfg
index 0a0b11c..7e3719a 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/grub/grub.cfg
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/grub/grub.cfg
@@ -29,14 +29,14 @@ menuentry "LinHES install medium (x86_64, UEFI)" {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
     linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+    initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
 menuentry "LinHES install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
     linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+    initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
 menuentry "UEFI Shell" {
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 b/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64
index a2a9b4a..b29f66d 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64
@@ -62,6 +62,7 @@ man-pages
 #mc
 mdadm
 memtest86+
+memtest86+-efi
 mkinitcpio
 mkinitcpio-archiso
 mkinitcpio-nfs-utils
@@ -133,7 +134,9 @@ network-manager-applet
 os-prober
 pipewire
 pipewire-alsa
+pipewire-audio
 pipewire-pulse
+pipewire-jack
 wireplumber
 xdg-user-dirs
 xf86-video-fbdev
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/pacman.conf b/linhes/linhes-dev/LinHES9_iso/cust_skel/pacman.conf
index 89af0f2..03c2137 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/pacman.conf
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/pacman.conf
@@ -32,10 +32,11 @@ Architecture = auto
 #UseSyslog
 #Color
 #NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 ParallelDownloads = 5
+DownloadUser = alpm
+#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -70,24 +71,24 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[linhes]
 [linhes-testing]
 SigLevel = Optional TrustAll
 Server = http://linhes.org/repo/$arch/$repo/
 
-#[testing]
+#[linhes]
+#SigLevel = Optional TrustAll
+#Server = http://linhes.org/repo/$arch/$repo/
+
+#[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/profiledef.sh b/linhes/linhes-dev/LinHES9_iso/cust_skel/profiledef.sh
index 4d0ec24..bb61d4b 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/profiledef.sh
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/profiledef.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2034
 
 iso_name="LinHES"
-iso_label="LinHES_$(date +%Y%m)"
+iso_label="LinHES_$(date +%Y%m%d)"
 iso_publisher="LinHES <https://linhes.org>"
 iso_application="LinHES Live/Installation CD"
 iso_version="R9_$(date +%Y.%m.%d)"
@@ -14,9 +14,12 @@ bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"
-airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
+airootfs_image_tool_options=('-comp' 'zstd' '-b' '1M')
+bootstrap_tarball_compression=(zstd)
 file_permissions=(
   ["/etc/shadow"]="0:0:400"
+  ["/etc/gshadow"]="0:0:0400"
+  ["/etc/sudoers"]="0:0:0440"
   ["/root"]="0:0:750"
   ["/root/.automated_script.sh"]="0:0:755"
   ["/usr/local/bin/choose-mirror"]="0:0:755"
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_pxe-linux.cfg b/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_pxe-linux.cfg
index 61d116c..1c00156 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_pxe-linux.cfg
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_pxe-linux.cfg
@@ -5,7 +5,7 @@ It allows you to install Ezarcher Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL LinHES (x86_64, NBD)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify cow_spacesize=4G copytoram=no
 SYSAPPEND 3
 
@@ -16,7 +16,7 @@ It allows you to install LinHES or perform system maintenance.
 ENDTEXT
 MENU LABEL LinHES (x86_64, NFS)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify cow_spacesize=4G
 SYSAPPEND 3
 
@@ -27,6 +27,6 @@ It allows you to install LinHES or perform system maintenance.
 ENDTEXT
 MENU LABEL LinHES (x86_64, HTTP)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify cow_spacesize=4G copytoram=no
 SYSAPPEND 3
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_sys-linux.cfg b/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_sys-linux.cfg
index e0887f2..8846c22 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_sys-linux.cfg
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_sys-linux.cfg
@@ -5,7 +5,7 @@ It allows you to install LinHES or perform system maintenance.
 ENDTEXT
 MENU LABEL LinHES (x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=no
 
 # Accessibility boot option
@@ -16,5 +16,5 @@ It allows you to install LinHES or perform system maintenance with speech feedba
 ENDTEXT
 MENU LABEL LinHES (x86_64, BIOS) with ^speech
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on cow_spacesize=4G copytoram=no
diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_tail.cfg b/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_tail.cfg
index e5339a2..c22c2f0 100644
--- a/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_tail.cfg
+++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/syslinux/archiso_tail.cfg
@@ -10,7 +10,7 @@ APPEND hd0 0
 # http://www.memtest.org/
 LABEL memtest
 MENU LABEL Run Memtest86+ (RAM test)
-LINUX /%INSTALL_DIR%/boot/memtest
+LINUX /boot/memtest86+/memtest
 
 # http://hdt-project.org/
 LABEL hdt
-- 
cgit v0.12

