update pkg

Author: UriHerrera

debian/changelog

@@ -1,3 +1,12 @@
+calamares-settings-nitrux (2.3.2) nitrux; urgency=medium
+
+  * Use the correct syntax for module configuration.
+  * Remove unused module conf file.
+  * Use luks1 because GRUB doesn't support argon2id.
+  * Change execution order of modules.
+
+ -- Uri Herrera <uri_herrera@nxos.org>  Thu, 09 Oct 2025 23:29:00 -0500
+
 calamares-settings-nitrux (2.3.1) nitrux; urgency=medium
 
   * Add package dependency.

etc/calamares/modules/bootloader.conf

@@ -10,6 +10,6 @@ grubCfg: "/boot/grub/grub.cfg"
 grubProbe: "grub-probe"
 efiBootMgr: "efibootmgr"
 
-# efiBootloaderId: "dirname"
-
 installEFIFallback: false
+
+installHybridGRUB: false

etc/calamares/modules/displaymanager.conf

@@ -7,7 +7,7 @@ displaymanagers:
 
 defaultDesktopEnvironment:
     executable: "/usr/bin/Hyprland"
-    desktopFile: "hyprland.desktop"
+    desktopFile: "hyprland"
 
 basicSetup: false
 sysconfigSetup: false

etc/calamares/modules/fstab.conf

@@ -2,19 +2,4 @@
 # SPDX-License-Identifier: CC0-1.0
 #
 ---
-mountOptions:
-    default: defaults
-    btrfs: defaults,noatime,space_cache=v2,autodefrag,compress=zstd
-    xfs: defaults,inode64
-    f2fs: defaults,compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime
-
-ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: ssd,compress=zstd,commit=120
-
-crypttabOptions: luks,keyscript=/bin/cat
-
-efiMountOptions: umask=0077
+crypttabOptions: luks

etc/calamares/modules/grubcfg.conf

@@ -3,8 +3,11 @@
 #
 ---
 overwrite: false
+prefer_grub_d: false
 keepDistributor: false
+
 kernel_params: ["amd_prefcore=enabled amd_pstate=active amdgpu.cik_support=1 amdgpu.ppfeaturemask=0xffffffff amdgpu.si_support=1 amdgpu.vm_update_mode=3 apparmor=1 audit=0 clocksource=tsc fsck.mode=skip hardened_usercopy=1 hpet=disable init_on_free=1 intel_pstate=enable kfence=off libahci.ignore_sss=1 lsm=capability,yama,bpf,apparmor,landlock modprobe.blacklist=iTCO_wdt,sp5100_tco_tco nohz=on nosgx nvidia_drm.modeset=1 nvme_core.multipath=Y overlayroot=tmpfs:swap=1,recurse=0 page_alloc.shuffle=1 pti=on quiet radeon.cik_support=0 radeon.si_support=0 randomize_kstack_offset=1 rcu_nocbs=all rcupdate.rcu_expedited=1 rcutree.enable_rcu_lazy=1 slab_nomerge tsc=nowatchdog tsc=reliable usbcore.autosuspend=-1 vdso32=0 vsyscall=none xhci_hcd.quirks=270336 zswap.compressor=zstd zswap.enabled=1 zswap.max_pool_percent=20 zswap.zpool=zsmalloc"]
+
 defaults:
     GRUB_DEFAULT: "saved"
     GRUB_DISABLE_OS_PROBER: false

etc/calamares/modules/keyboard.conf

@@ -3,4 +3,3 @@
 #
 ---
 xOrgConfFileName: "/etc/X11/xorg.conf.d/00-keyboard.conf"
-#writeEtcDefaultKeyboard:   true

etc/calamares/modules/luksbootkeyfile.conf

@@ -2,14 +2,4 @@
 # SPDX-License-Identifier: CC0-1.0
 #
 ---
-# Set Password-Based Key Derivation Function (PBKDF) algorithm 
-# for LUKS keyslot.
-#
-# There are three usable values: pbkdf2, argon2i or argon2id.
-#
-# When not set, the cryptsetup default is used
-#luks2Hash: argon2id
-
-# An optional variable from global storage which holds the bootloader and is used to 
-# override the value of efiSystemPartition
-#efiBootLoaderVar: ""
+luks2Hash: default

etc/calamares/modules/mount.conf

@@ -25,3 +25,23 @@ extraMounts:
     - device: /dev/pts
       mountPoint: /dev/pts
       options: [ bind ]
+
+mountOptions:
+    - filesystem: default
+      options: [ defaults ]
+    - filesystem: efi
+      options: [ umask=0077 ]
+    - filesystem: btrfs
+      options: [ defaults, noatime, space_cache=v2, autodefrag, compress=zstd ]
+      ssdOptions: [ ssd, compress=zstd, commit=120 ]
+    - filesystem: xfs
+      options: [ defaults, inode64 ]
+      ssdOptions: [ discard ]
+    - filesystem: f2fs
+      options: [ defaults, compress_algorithm=zstd:6, compress_chksum, atgc, gc_merge, lazytime ]
+    - filesystem: ext4
+      ssdOptions: [ discard ]
+    - filesystem: jfs
+      ssdOptions: [ discard ]
+    - filesystem: swap
+      ssdOptions: [ discard ]

etc/calamares/modules/partition.conf

@@ -2,9 +2,10 @@
 # SPDX-License-Identifier: CC0-1.0
 #
 ---
-efiSystemPartition: "/boot/efi"
-efiSystemPartitionSize: 100M
-efiSystemPartitionName: ESP
+efi:
+    mountPoint:         "/boot/efi"
+    recommendedSize:    100MiB
+    label:              "ESP"
 
 userSwapChoices:
     - none
@@ -14,7 +15,7 @@ userSwapChoices:
 
 swapPartitionName: SWAP
 
-luksGeneration: luks2
+luksGeneration: luks1
 
 drawNestedPartitions: true
 alwaysShowPartitionLabels: true
@@ -23,9 +24,7 @@ allowManualPartitioning: true
 initialPartitioningChoice: manual
 initialSwapChoice: small
 
-defaultPartitionTableType:
-    - gpt
-    - msdos
+defaultPartitionTableType: gpt
 
 requiredPartitionTableType:
     - gpt
@@ -46,12 +45,12 @@ partitionLayout:
       mountPoint: "/home"
       size: 67%
       features:
-         compression
-         encryption
+        compression: true
+        encryption: true
     - name: "NX_VAR_LIB"
       filesystem: "f2fs"
       mountPoint: "/var/lib"
       size: 10%
       features:
-         compression
-         encryption
+        compression: true
+        encryption: true

etc/calamares/modules/services-openrc.conf

@@ -7,6 +7,4 @@ initdDir: /etc/init.d
 runlevelsDir: /etc/runlevels
 
 services: []
-disable:
-    - name: pulseaudio-enable-autospawn
-      runlevel: default
+disable: []