From 0ba139a7e96e3aca2545718f3f42981117d4110e Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 10 Feb 2025 18:26:43 +0330
Subject: [PATCH] Fixed Branding

---
 .../branding/parchlinux/branding.desc         |  4 +-
 etc/calamares/modules/machineid.conf          | 17 ++++++
 etc/calamares/modules/mount.conf              | 47 ++++++++++++++-
 etc/calamares/modules/users.conf              | 59 +++++++++++++++++++
 4 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 etc/calamares/modules/machineid.conf
 create mode 100644 etc/calamares/modules/users.conf

diff --git a/etc/calamares/branding/parchlinux/branding.desc b/etc/calamares/branding/parchlinux/branding.desc
index dba33cf..c3a055c 100644
--- a/etc/calamares/branding/parchlinux/branding.desc
+++ b/etc/calamares/branding/parchlinux/branding.desc
@@ -5,11 +5,11 @@ welcomeStyleCalamares:   false
 
 welcomeExpandingLogo:   true
 
-windowExpanding:    normal
+windowExpanding:    fullscreen
 
 windowPlacement: center
 
-sidebar: widget
+sidebar: none
 
 navigation: widget
 
diff --git a/etc/calamares/modules/machineid.conf b/etc/calamares/modules/machineid.conf
new file mode 100644
index 0000000..987ef67
--- /dev/null
+++ b/etc/calamares/modules/machineid.conf
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Machine-ID and other random data on the target system.
+---
+
+systemd: true
+
+dbus: true
+
+dbus-symlink: true
+
+entropy-copy: false
+
+entropy-files:
+    - /var/lib/urandom/random-seed
+    - /var/lib/systemd/random-seed
diff --git a/etc/calamares/modules/mount.conf b/etc/calamares/modules/mount.conf
index 5722380..dc0912a 100644
--- a/etc/calamares/modules/mount.conf
+++ b/etc/calamares/modules/mount.conf
@@ -4,7 +4,6 @@
 # Mount filesystems in the target (generally, before treating the
 # target as a usable chroot / "live" system).
 ---
-
 setSELinux: false
 
 extraMounts:
@@ -48,4 +47,48 @@ mountOptions:
     - filesystem: btrfs
       options: [ noatime, compress=zstd ]
     - filesystem: btrfs_swap
-      options: [ noatime ]
\ No newline at end of file
+      options: [ noatime ]
+setSELinux: false
+
+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
+
+btrfsSwapSubvol: /@swap
+
+btrfsSubvolumes:
+    - mountPoint: /
+      subvolume: /@
+    - mountPoint: /home
+      subvolume: /@home
+    - mountPoint: /var/cache
+      subvolume: /@cache
+    - mountPoint: /var/log
+      subvolume: /@log
+
+mountOptions:
+    - filesystem: default
+      options: [ noatime ]
+    - filesystem: efi
+      options: [ fmask=0137, dmask=0027 ]
+    - filesystem: btrfs
+      options: [ noatime, compress=zstd ]
+    - filesystem: btrfs_swap
+      options: [ noatime ]
diff --git a/etc/calamares/modules/users.conf b/etc/calamares/modules/users.conf
new file mode 100644
index 0000000..2d0c567
--- /dev/null
+++ b/etc/calamares/modules/users.conf
@@ -0,0 +1,59 @@
+
+defaultGroups:
+    - name: users
+      must_exist: true
+      system: true
+    - lp
+    - video
+    - network
+    - storage
+    - power
+    - rfkill
+    - name: wheel
+      must_exist: false
+      system: true
+    - audio
+
+
+sudoersGroup:    wheel
+
+autologinGroup:  autologin
+
+
+sudoersConfigureWithGroup: true 
+
+setRootPassword: false
+
+doReusePassword: false
+
+
+doAutologin:    false
+
+# These are very weak -- actually, none at all -- requirements
+passwordRequirements:
+    minLength: 1  # Password at least this many characters
+#    maxLength: 10  # Password at most this many characters
+#    libpwquality:
+#        - minlen=0
+#        - minclass=0
+
+allowWeakPasswords: true
+
+allowWeakPasswordsDefault: false
+
+user:
+  shell: /bin/bash
+  forbidden_names: [ root ]
+
+hostname:
+  location: EtcFile
+  writeHostsFile: true
+  forbidden_names: [ localhost ]
+
+presets:
+    fullName:
+        # value: "ParchLinux User"
+        editable: true
+    loginName:
+        # value: "ParchLinux"
+        editable: true