rosenthal: noctalia-shell: Update to 4.6.1.

* modules/rosenthal/packages/wm.scm (noctalia-shell): Update to 4.6.1.
[inputs]: Replace quickshell with noctalia-qs.

modules/rosenthal/bootloader/limine.scm

@@ -56,7 +56,7 @@
                  (limine-directory (in-vicinity directory "EFI/BOOT"))
                  (guix-directory (in-vicinity directory "EFI/Guix")))
             (for-each mkdir-p (list limine-directory guix-directory))
-            (install-file #$limine limine-directory)
+            ;; Install unified kernel images and generate Limine configuration.
             (call-with-output-file (in-vicinity limine-directory "limine.conf.tmp")
               (lambda (port)
                 (let* ((ukify #$(file-append ukify "/bin/ukify"))
@@ -78,32 +78,36 @@
                             current-label)
                     (unless (null? old-labels)
                       (format port "~%/GNU system, old configurations...~%"))
-                    (let loop ((count 1)
+                    (false-if-exception
-                               (labels old-labels)
+                     (let loop ((count 1)
-                               (args old-args))
+                                (labels old-labels)
-                      (let* ((image-name (format #f "OLD-~a.EFI" count)))
+                                (args old-args))
-                        (unless (null? labels)
+                       (let* ((image-name (format #f "OLD-~a.EFI" count)))
-                          (with-exception-handler
+                         (unless (null? labels)
-                              (lambda _
+                           (with-exception-handler
-                                (false-if-exception (delete-file image-name))
+                               (lambda _
-                                (exit))
+                                 (false-if-exception (delete-file image-name))
-                            (lambda ()
+                                 ;; Exit loop.
-                              (when (< (free-disk-space ".") minbytes)
+                                 (loop 0 '() '()))
-                                (raise-exception 'insuffcient-disk-space))
+                             (lambda ()
-                              (apply invoke/quiet
+                               (when (< (free-disk-space ".") minbytes)
-                                     ukify "build" "--output" image-name
+                                 (raise-exception 'insuffcient-disk-space))
-                                     (first args))
+                               (apply invoke/quiet
-                              (format port "~
+                                      ukify "build" "--output" image-name
+                                      (first args))
+                               (format port "~
 //~a
   protocol: efi
   path: boot():/EFI/Guix/OLD-~a.EFI~%"
-                                      (first labels)
+                                       (first labels)
-                                      count)))
+                                       count)))
-                          (loop (1+ count)
+                           (loop (1+ count)
-                                (cdr labels)
+                                 (cdr labels)
-                                (cdr args)))))))))
+                                 (cdr args))))))))
-            (rename-file (in-vicinity limine-directory "limine.conf.tmp")
+                (rename-file (in-vicinity limine-directory "limine.conf.tmp")
-                         (in-vicinity limine-directory "limine.conf")))))))
+                             (in-vicinity limine-directory "limine.conf"))
+                ;; Finally, install Limine.
+                (install-file #$limine limine-directory))))))))
 
 (define install-limine-efi
   #~(lambda (bootloader target mount-point)

modules/rosenthal/packages/wm.scm

@@ -30,6 +30,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages polkit)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages version-control)
@@ -39,7 +40,7 @@
 (define-public noctalia-shell
   (package
     (name "noctalia-shell")
-    (version "4.5.0")
+    (version "4.6.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -48,7 +49,7 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1syqsml49jfjpngi7b099jcggp66lrls0ha6w5daqd5xhd2z94v3"))))
+                "12plnkf46ncw9cx5mh2di23jvwd0hbxayr5bjlaj9blz63r10cjs"))))
     (build-system copy-build-system)
     (arguments
      (list
@@ -135,10 +136,10 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
            imagemagick
            khal
            network-manager
+           noctalia-qs
            python-minimal
            qtbase
            qtwayland
-           quickshell
            which
            wl-clipboard
            wlsunset
@@ -151,3 +152,23 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
 supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
 @code{sway}.")
     (license license:expat)))
+
+(define-public noctalia-qs
+  (package
+    (inherit quickshell)
+    (name "noctalia-qs")
+    (version "0.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/noctalia-dev/noctalia-qs")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0gyk951pk946dib3rdsgk7nzxwxvghjvp26rs5f32x6a8g8ww1fm"))))
+    (inputs
+     (modify-inputs (package-inputs quickshell)
+       (prepend glib polkit)))
+    (home-page "https://noctalia.dev/")
+    (synopsis "QtQuick-based desktop shell toolkit (Noctalia fork)")))