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 unified kernel images and generate Limine configuration.
+            (install-file #$limine limine-directory)
             (call-with-output-file (in-vicinity limine-directory "limine.conf.tmp")
               (lambda (port)
                 (let* ((ukify #$(file-append ukify "/bin/ukify"))
@@ -78,7 +78,6 @@
                             current-label)
                     (unless (null? old-labels)
                       (format port "~%/GNU system, old configurations...~%"))
-                    (false-if-exception
                     (let loop ((count 1)
                                (labels old-labels)
                                (args old-args))
@@ -87,8 +86,7 @@
                           (with-exception-handler
                               (lambda _
                                 (false-if-exception (delete-file image-name))
-                                 ;; Exit loop.
-                                 (loop 0 '() '()))
+                                (exit))
                             (lambda ()
                               (when (< (free-disk-space ".") minbytes)
                                 (raise-exception 'insuffcient-disk-space))
@@ -103,11 +101,9 @@
                                       count)))
                           (loop (1+ count)
                                 (cdr labels)
-                                 (cdr args))))))))
+                                (cdr args)))))))))
             (rename-file (in-vicinity limine-directory "limine.conf.tmp")
-                             (in-vicinity limine-directory "limine.conf"))
-                ;; Finally, install Limine.
-                (install-file #$limine limine-directory))))))))
+                         (in-vicinity limine-directory "limine.conf")))))))
 
 (define install-limine-efi
   #~(lambda (bootloader target mount-point)

modules/rosenthal/packages/wm.scm

@@ -30,7 +30,6 @@
   #: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)
@@ -40,7 +39,7 @@
 (define-public noctalia-shell
   (package
     (name "noctalia-shell")
-    (version "4.6.1")
+    (version "4.5.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -49,7 +48,7 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "12plnkf46ncw9cx5mh2di23jvwd0hbxayr5bjlaj9blz63r10cjs"))))
+                "1syqsml49jfjpngi7b099jcggp66lrls0ha6w5daqd5xhd2z94v3"))))
     (build-system copy-build-system)
     (arguments
      (list
@@ -136,10 +135,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
@@ -152,23 +151,3 @@ 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)")))