From 7b39f4778b567df2ef52b01aa0213425db51ac6e Mon Sep 17 00:00:00 2001
From: Valeria Fadeeva <valeria.fadeeva.me@gmail.com>
Date: Mon, 6 Jan 2025 16:33:50 +0500
Subject: [PATCH] Update

---
 settings.conf                                 | 46 ++++++++-----------
 .../shellprocess_final_chrooted.conf          |  1 +
 src/modules/unpackfs/unpackfs.conf            |  6 +--
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/settings.conf b/settings.conf
index 1951a41..ff31336 100644
--- a/settings.conf
+++ b/settings.conf
@@ -1,29 +1,33 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 #
-# Configuration file for Melawy Linux Calamares online installs
+# Configuration file for Melawy Linux offline installs
 ---
 
 modules-search: [ local ]
 
 instances:
-- id:       online
+- id:       offline
   module:   packages
-  config:   packages_online.conf
+  config:   packages_offline.conf
 
-- id:       online
+- id:       offline
   module:   welcome
-  config:   welcome_online.conf
+  config:   welcome_offline.conf
 
-#  - shellprocess_copy_packages_dont_chroot
-- id:       copy_packages_dont_chroot
+- id:       offline
+  module:   eos_bootloader
+  config:   eos_bootloader_offline.conf
+
+#  - shellprocess@reset_systemd_multiuser_chrooted
+- id:       reset_systemd_multiuser_chrooted
   module:   shellprocess
-  config:   shellprocess_copy_packages_dont_chroot.conf
+  config:   shellprocess_reset_systemd_multiuser_chrooted.conf
 
 #  - shellprocess@initialize_pacman_dont_chroot
 - id:       initialize_pacman_dont_chroot
   module:   shellprocess
-  config:   shellprocess_initialize_pacman_dont_chroot_online.conf
+  config:   shellprocess_initialize_pacman_dont_chroot_offline.conf
 
 #  - shellprocess@remove_ucode_chrooted
 - id:       remove_ucode_chrooted
@@ -60,11 +64,6 @@ instances:
   module:   shellprocess
   config:   shellprocess_copy_install_logs_dont_chroot.conf
 
-#  - shellprocess@install_nvidia_drivers_chrooted
-- id:       install_nvidia_drivers_chrooted
-  module:   shellprocess
-  config:   shellprocess_install_nvidia_drivers_chrooted.conf
-
 #  - shellprocess@install_intel_drivers_chrooted
 - id:       install_intel_drivers_chrooted
   module:   shellprocess
@@ -73,11 +72,9 @@ instances:
 
 sequence:
 - show:
-  - welcome@online
+  - welcome@offline
   - locale
   - keyboard
-#  - packagechooser
-  - netinstall
   - packagechooserq
   - partition
   - users
@@ -85,31 +82,28 @@ sequence:
 - exec:
   - hardwaredetect
   - partition
-#  - zfs
   - mount
-  - shellprocess@copy_packages_dont_chroot
-  - shellprocess@initialize_pacman_dont_chroot
-  - pacstrap
+  - unpackfs
+  - shellprocess@reset_systemd_multiuser_chrooted
   - machineid
   - fstab
   - locale
   - keyboard
   - localecfg
-#  - userpkglist
-  - packages@online
   - luksbootkeyfile
-#  - zfshostid
+  - removeuser
   - users
   - networkcfg
   - displaymanager
+  - shellprocess@initialize_pacman_dont_chroot
+  - packages@offline
   - hwclock
   - shellprocess@remove_ucode_chrooted
-  - eos_bootloader
+  - eos_bootloader@offline
   - grubcfg
   - bootloader
   - services-systemd
   - shellprocess@copy_refind_theme_chrooted
-  - shellprocess@install_nvidia_drivers_chrooted
   - shellprocess@install_intel_drivers_chrooted
   - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
   - shellprocess@build_dracut_kernels_and_menu_chrooted
diff --git a/src/modules/shellprocess/shellprocess_final_chrooted.conf b/src/modules/shellprocess/shellprocess_final_chrooted.conf
index ef5354c..95618aa 100644
--- a/src/modules/shellprocess/shellprocess_final_chrooted.conf
+++ b/src/modules/shellprocess/shellprocess_final_chrooted.conf
@@ -147,3 +147,4 @@ script:
   - command: "-/usr/local/bin/dmcheck"
   - "-rm -rf /usr/local/bin/*"
 
+ - '-sed -i /etc/sddm.conf.d/kde_settings.conf -e "s/liveuser//"'
diff --git a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf
index 7f4f645..80cc222 100644
--- a/src/modules/unpackfs/unpackfs.conf
+++ b/src/modules/unpackfs/unpackfs.conf
@@ -91,6 +91,6 @@ unpack:
     -   source: "/run/archiso/bootmnt/arch/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux-cachyos"
-        sourcefs: "file"
-        destination: "/boot/vmlinuz-linux-cachyos"
+    # -   source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux-cachyos"
+    #     sourcefs: "file"
+    #     destination: "/boot/vmlinuz-linux-cachyos"