rosenthal: noctalia-shell: Update to 4.7.0.

* modules/rosenthal/packages/wm.scm (noctalia-shell): Update to 4.7.0.
[arguments, inputs]: Remove cava.

modules/rosenthal/bootloader/grub.scm

@@ -2,23 +2,12 @@
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 
 (define-module (rosenthal bootloader grub)
+  ;; Utilities
+  #:use-module (guix deprecation)
   ;; Guix System - bootloaders
-  #:use-module (gnu bootloader)
   #:use-module (gnu bootloader grub)
-  ;; Guix packages
-  #:use-module (rosenthal packages bootloaders)
   #:export (grub-efi-luks2-bootloader
             grub-efi-luks2-removable-bootloader))
 
-(define grub-efi-luks2-bootloader
-  (bootloader
-   (inherit grub-efi-bootloader)
-   ;; NOTE: Don't change the name.  Generation switching code only knows
-   ;; bootloaders defined in (gnu bootloader grub).
-   (name 'grub-efi)
-   (package grub-efi-luks2)))
-
-(define grub-efi-luks2-removable-bootloader
-  (bootloader
-   (inherit grub-efi-removable-bootloader)
-   (package grub-efi-luks2)))
+(define-deprecated/alias grub-efi-luks2-bootloader grub-efi-bootloader)
+(define-deprecated/alias grub-efi-luks2-removable-bootloader grub-efi-removable-bootloader)

modules/rosenthal/packages/bootloaders.scm

@@ -5,6 +5,7 @@
 (define-module (rosenthal packages bootloaders)
   #:use-module (srfi srfi-26)
   ;; Utilities
+  #:use-module (guix deprecation)
   #:use-module (guix gexp)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -33,46 +34,7 @@
   #:use-module (gnu packages python-xyz)
   #:export (systemd-stub-name))
 
-;; Patches obtained from:
-;; <https://leo3418.github.io/collections/gentoo-config-luks2-grub-systemd/packages.html>
-
-(define grub-luks2-argon2-support-patch
-  (origin
-    (method url-fetch)
-    (uri (string-append "https://leo3418.github.io/"
-                        "res/collections/gentoo-config-luks2-grub-systemd/"
-                        "grub-2.12-luks2-argon2-v4.patch"))
-    (sha256
-     (base32
-      "02y15k6rd5vj2shfijyhq2nr2775vpa55ijfy6bb8irpnh8i2272"))))
-
-(define-public grub-efi-luks2
-  (let ((base grub-efi))
-    (package
-      (inherit base)
-      (name "grub-efi-luks2")
-      (source
-       (let ((base (package-source base)))
-         (origin
-           (inherit base)
-           (patches
-            (append (origin-patches base)
-                    (list grub-luks2-argon2-support-patch))))))
-      (arguments
-       (substitute-keyword-arguments (package-arguments base)
-         ((#:configure-flags flags ''())
-          #~(append #$flags '("--disable-werror")))
-         ((#:phases phases '%standard-phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'delete-configure-script
-                (lambda _
-                  (delete-file "configure")))))))
-      (native-inputs
-       (modify-inputs (package-native-inputs base)
-         (append autoconf automake python-minimal-wrapper)))
-      (properties
-       `(,@(package-properties base)
-         (disable-updater? . #t))))))
+(define-deprecated-package grub-efi-luks2 grub-efi)
 
 (define-public limine
   (package

modules/rosenthal/packages/patches/guix-wip-zfs-boot-support.patch

@@ -1,55 +1,48 @@
-From ab4aa6e7bb41fe0f2c64cfb587562b19a7cb44ff Mon Sep 17 00:00:00 2001
-Message-ID: <ab4aa6e7bb41fe0f2c64cfb587562b19a7cb44ff.1757826291.git.hako@ultrarare.space>
+From 1067857a13a015602c9bc8c5cf0aa81e7869739c Mon Sep 17 00:00:00 2001
+Message-ID: <1067857a13a015602c9bc8c5cf0aa81e7869739c.1773748638.git.hako@ultrarare.space>
 From: Hilton Chain <hako@ultrarare.space>
 Date: Sun, 7 Sep 2025 13:52:57 +0800
 Subject: [PATCH] WIP: ZFS boot support.
 
 Change-Id: I6579a36d66fcd0a487fe262c9a7c36e51532cb70
 ---
- gnu/build/file-systems.scm  | 21 ++++++++++++++-------
+ gnu/build/file-systems.scm  | 14 ++++++++++----
  gnu/build/linux-boot.scm    |  1 +
  gnu/system/file-systems.scm | 30 +++++++++++++++++++++---------
  gnu/system/linux-initrd.scm | 25 ++++++++++++++++++++-----
  guix/scripts/system.scm     |  3 ++-
- 5 files changed, 58 insertions(+), 22 deletions(-)
+ 5 files changed, 54 insertions(+), 19 deletions(-)
 
 diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
-index c506a4911ff..05d0cb819ae 100644
+index 33b035aa967..7a863afd1ea 100644
 --- a/gnu/build/file-systems.scm
 +++ b/gnu/build/file-systems.scm
-@@ -1173,13 +1173,20 @@ (define (canonicalize-device-spec spec)
+@@ -1226,10 +1226,16 @@ (define (canonicalize-device-spec spec)
  
    (match spec
      ((? string?)
--     (if (or (string-contains spec ":/") ;nfs
--             (and (>= (string-length spec) 2)
--                  (equal? (string-take spec 2) "//")) ;cifs
--             (string=? spec "none"))
--         spec                  ; do not resolve NFS / CIFS / tmpfs devices
+-     (if (string-prefix? "/dev/" spec)
 -         ;; Nothing to do, but wait until SPEC shows up.
--         (resolve identity spec identity)))
+-         (resolve device-exists? spec identity)
+-         spec)) ; do not resolve NFS / CIFS / tmpfs devices
 +     (cond
-+      ((or (string-contains spec ":/") ;nfs
-+           (and (>= (string-length spec) 2)
-+                (equal? (string-take spec 2) "//")) ;cifs
-+           (string=? spec "none"))
-+       ;; Do not resolve NFS / CIFS / tmpfs devices.
-+       spec)
-+      ((and (>= (string-length spec) 4)
-+            (string=? (string-take spec 4) "zfs:"))
++      ((string-prefix? "/dev/" spec)
++       ;; Nothing to do, but wait until SPEC shows up.
++       (resolve device-exists? spec identity))
++      ((string-prefix? "zfs:" spec)
 +       ;; "zfs:zpool/dataset" => "zpool/dataset"
 +       (string-drop spec 4))
 +      (else
-+       ;; Nothing to do, but wait until SPEC shows up.
-+       (resolve identity spec identity))))
++       ;; Do not resolve NFS / CIFS / tmpfs devices
++       spec)))
      ((? file-system-label?)
       ;; Resolve the label.
       (resolve find-partition-by-label
 diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
-index 548e28a1c97..2b577483832 100644
+index e0743eae55a..f0085f74962 100644
 --- a/gnu/build/linux-boot.scm
 +++ b/gnu/build/linux-boot.scm
-@@ -523,6 +523,7 @@ (define* (boot-system #:key
+@@ -542,6 +542,7 @@ (define* (boot-system #:key
      ;; So check for all four.
      (cond ((string-prefix? "/" device-string) device-string)
            ((string-contains device-string ":/") device-string) ; nfs-root
@@ -58,7 +51,7 @@ index 548e28a1c97..2b577483832 100644
            (else (file-system-label device-string))))
  
 diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
-index 4ea8237c70d..c6cf828db21 100644
+index f83b67c4770..00c611eaa97 100644
 --- a/gnu/system/file-systems.scm
 +++ b/gnu/system/file-systems.scm
 @@ -372,7 +372,9 @@ (define %pseudo-file-system-types
@@ -72,7 +65,7 @@ index 4ea8237c70d..c6cf828db21 100644
  
  (define %fuse-control-file-system
    ;; Control file system for Linux' file systems in user-space (FUSE).
-@@ -627,18 +629,21 @@ (define (file-system-mount-point-predicate mount-point)
+@@ -628,18 +630,21 @@ (define (file-system-mount-point-predicate mount-point)
  
  
  ;;;
@@ -102,7 +95,7 @@ index 4ea8237c70d..c6cf828db21 100644
  
  (define (btrfs-store-subvolume-file-name file-systems)
    "Return the subvolume file name within the Btrfs top level onto which the
-@@ -664,6 +669,13 @@ (define (btrfs-store-subvolume-file-name file-systems)
+@@ -665,6 +670,13 @@ (define (btrfs-store-subvolume-file-name file-systems)
      ;; XXX: Deriving the subvolume name based from a subvolume ID is not
      ;; supported, as we'd need to query the actual file system.
      (or (and=> (assoc-ref options "subvol") prepend-slash/maybe)
@@ -117,7 +110,7 @@ index 4ea8237c70d..c6cf828db21 100644
                  (&message
                   (message "The store is on a Btrfs subvolume, but the \
 diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
-index 978084062b2..8bd4a4a7850 100644
+index a9dabde7a32..3f0d8fc9f30 100644
 --- a/gnu/system/linux-initrd.scm
 +++ b/gnu/system/linux-initrd.scm
 @@ -249,11 +249,25 @@ (define* (raw-initrd file-systems
@@ -153,7 +146,7 @@ index 978084062b2..8bd4a4a7850 100644
      (flat-linux-module-directory (cons linux linux-extra-module-directories)
 @@ -364,6 +378,7 @@ (define file-system-type-modules
                      ("jfs" => '("jfs"))
-                     ("f2fs" => '("f2fs" "crc32_generic"))
+                     ("f2fs" => '("f2fs" "crc32_cryptoapi"))
                      ("xfs" => '("xfs"))
 +                    ("zfs" => '("zfs"))
                      (else '())))
@@ -174,11 +167,9 @@ index 8a56f1cc63d..75a5bb1d5f1 100644
  
    (define uuid
 
-base-commit: 6174b135ffa3328fd7ad404b15b1586fc64e5666
-prerequisite-patch-id: f71061d735b69d75799eb03df6215bbcb20d53b2
-prerequisite-patch-id: 88337e68e714f3b1fe0d8e6588a1a4f423251610
-prerequisite-patch-id: 466ade9e99cc152f8e9a33c742a4954ade466c25
-prerequisite-patch-id: d66207367fc491f6569100503cd9df98b6888560
+base-commit: aeeb8be0e27b4109eb2be27efe6bb7b2aa50e003
+prerequisite-patch-id: 0362b1fd022cc44cfa7181eda3d5dfea669519a3
+prerequisite-patch-id: 813f6928b0d005ee2b7a441c93b1a6f9472a3483
 -- 
-2.51.0
+2.52.0
 

modules/rosenthal/packages/wm.scm

@@ -40,7 +40,7 @@
 (define-public noctalia-shell
   (package
     (name "noctalia-shell")
-    (version "4.6.6")
+    (version "4.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -49,7 +49,7 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "132jkz4pfs7wkx26qvdshhxl0vd3bfpxnyd2qaf8gr84b1ma9jxd"))))
+                "0qylp37xrb71c3a5fr55a5zr7ibb4nd87jkdw01l54ij15jrdqxd"))))
     (build-system copy-build-system)
     (arguments
      (list
@@ -91,7 +91,6 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
                                    (cut search-input-file inputs <>))
                           '("bin/bluetoothctl"
                             "bin/brightnessctl"
-                            "bin/cava"
                             "bin/cliphist"
                             "bin/convert"
                             "bin/ddcutil"
@@ -121,7 +120,6 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
      (list bash-minimal
            bluez
            brightnessctl
-           cava
            cliphist
            coreutils-minimal
            ddcutil
@@ -139,6 +137,7 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
            noctalia-qs
            python-minimal
            qtbase
+           qtmultimedia
            qtwayland
            which
            wl-clipboard
@@ -157,7 +156,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
   (package
     (inherit quickshell)
     (name "noctalia-qs")
-    (version "0.0.4")
+    (version "0.0.8")
     (source
      (origin
        (method git-fetch)
@@ -166,7 +165,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0gyk951pk946dib3rdsgk7nzxwxvghjvp26rs5f32x6a8g8ww1fm"))))
+        (base32 "0pyakmaq2bwdhnnqnrsqm9g1mjf5spij6hsvmlw058kxj8xkbbd4"))))
     (inputs
      (modify-inputs (package-inputs quickshell)
        (prepend glib polkit)))