modules/rosenthal/bootloader/limine.scm

@@ -60,6 +60,8 @@
             (call-with-output-file (in-vicinity limine-directory "limine.conf.tmp")
               (lambda (port)
                 (let* ((ukify #$(file-append ukify "/bin/ukify"))
+                       (script-path (first args))
+                       (minbytes (* 2 (stat:size (stat script-path))))
                        (current-label (first '#$labels))
                        (current-args  (first (list #$@ukify-args)))
                        (old-labels    (cdr   '#$labels))
@@ -67,7 +69,7 @@
                   (format port "timeout: 5~%")
                   (with-directory-excursion guix-directory
                     (for-each delete-file (find-files "." "^OLD-[0-9]+\\.EFI$"))
-                    (apply invoke/quiet ukify "build" "--output" "CURRENT.EFI"
+                    (apply invoke ukify "build" "--output" "CURRENT.EFI"
                            current-args)
                     (format port "
 /~a
@@ -84,10 +86,12 @@
                          (unless (null? labels)
                            (with-exception-handler
                                (lambda _
-                                 (delete-file image-name)
+                                 (false-if-exception (delete-file image-name))
                                  ;; Exit loop.
                                  (loop 0 '() '()))
                              (lambda ()
+                               (when (< (free-disk-space ".") minbytes)
+                                 (raise-exception 'insuffcient-disk-space))
                                (apply invoke/quiet
                                       ukify "build" "--output" image-name
                                       (first args))

modules/rosenthal/bootloader/uki.scm

@@ -48,7 +48,7 @@
                               ((target-aarch64?) "AA64")
                               ((target-riscv64?) "RISCV64"))))))
             (mkdir-p (dirname installation-path))
-            (apply invoke/quiet #$(file-append ukify "/bin/ukify")
+            (apply invoke #$(file-append ukify "/bin/ukify")
                    "build" "--output" installation-path
                    #$(menu-entry->ukify-args (first entries))))))))
 

modules/rosenthal/packages/admin.scm

@@ -59,16 +59,17 @@ the user to manage services with dependencies and parallel startup.")
     (license license:asl2.0)))
 
 (define-public libseat-sans-logind
-  (package
+  (let ((base libseat))
-    (inherit libseat)
+    (package
-    (name "libseat-sans-logind")
+      (inherit base)
-    (arguments
+      (name "libseat-sans-logind")
-     (substitute-keyword-arguments arguments
+      (arguments
-       ((#:configure-flags configure-flags)
+       (substitute-keyword-arguments (package-arguments base)
-        #~(append #$configure-flags
+         ((#:configure-flags configure-flags)
-                  (list "-Dlibseat-logind=disabled")))))
+          #~(append #$configure-flags
-    (propagated-inputs '())
+                    (list "-Dlibseat-logind=disabled")))))
-    (properties '((disable-updater? . #t)))))
+      (propagated-inputs '())
+      (properties '((disable-updater? . #t))))))
 
 (define-public pam-dumb-runtime-dir
   (package
@@ -108,13 +109,14 @@ exists and is only writable by root.")
     (license license:bsd-0)))
 
 (define-public seatd-sans-logind
-  (package
+  (let ((base seatd))
-    (inherit seatd)
+    (package
-    (name "seatd-sans-logind")
+      (inherit base)
-    (arguments
+      (name "seatd-sans-logind")
-     (substitute-keyword-arguments arguments
+      (arguments
-       ((#:configure-flags configure-flags)
+       (substitute-keyword-arguments (package-arguments base)
-        #~(append #$configure-flags
+         ((#:configure-flags configure-flags)
-                  (list "-Dlibseat-logind=disabled")))))
+          #~(append #$configure-flags
-    (propagated-inputs '())
+                    (list "-Dlibseat-logind=disabled")))))
-    (properties '((disable-updater? . #t)))))
+      (propagated-inputs '())
+      (properties '((disable-updater? . #t))))))

modules/rosenthal/packages/busybox.scm

@@ -15,7 +15,7 @@
       (inherit base)
       (name "busybox-static")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'configure 'static-build

modules/rosenthal/packages/emacs-xyz.scm

@@ -33,10 +33,10 @@
           (base32
            "0h0fxybdb23cyx4xqz4axyp4sbqi2bqcvcwqin74l59wmfwpz0rr"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments emacs-arei)
          ((#:lisp-directory _ #f) "lisp")))
       (propagated-inputs
-       (modify-inputs propagated-inputs
+       (modify-inputs (package-propagated-inputs emacs-arei)
          (prepend emacs-consult))))))
 
 (define-public emacs-caddyfile-mode

modules/rosenthal/packages/package-management.scm

@@ -20,6 +20,6 @@
                           "guix-wip-zfs-boot-support.patch")))
     (name "guix-dolly")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments guix)
        ((#:parallel-build? _ #f) #t)))
     (properties '((disable-updater? . #t)))))

modules/rosenthal/packages/ssh.scm

@@ -17,11 +17,11 @@
       (inherit dropbear)
       (name "dropbear-static")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:configure-flags flags)
           #~(append #$flags (list "--enable-static")))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (append `(,zlib "static"))
          (replace "libtomcrypt" `(,libtomcrypt "static"))
          (replace "libtommath" `(,libtommath "static"))))

modules/rosenthal/packages/video.scm

@@ -15,12 +15,12 @@
       (inherit base)
       (name "libva-nox")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:configure-flags configure-flags)
           #~(append #$configure-flags (list "--disable-glx")))
          ((#:phases _) #~%standard-phases)))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (delete "libx11" "libxext" "libxfixes")))
       (properties
        `(,@(package-properties base)

modules/rosenthal/packages/web.scm

@@ -207,7 +207,7 @@ from serving static websites to running dynamic web applications.")
                (base32
                 "14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3"))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs caddy)
        (replace "vendored-go-dependencies"
          (origin
            (method (go-mod-vendor #:go go-1.25))

modules/rosenthal/packages/wm.scm

@@ -167,7 +167,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
        (sha256
         (base32 "0pyakmaq2bwdhnnqnrsqm9g1mjf5spij6hsvmlw058kxj8xkbbd4"))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs quickshell)
        (prepend glib polkit)))
     (home-page "https://noctalia.dev/")
     (synopsis "QtQuick-based desktop shell toolkit (Noctalia fork)")))

modules/rosenthal/utils/packages.scm

@@ -169,7 +169,7 @@ packages, excluding superseded packages."
     (version (package-version (assoc-ref source-mapping default-system)))
     (source #f)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments p)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
             (replace 'unpack