seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2026-03-28 13:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: seasharp:3f4240e093107d9184730adb635c309fe1c8d118
Branches Tags
seasharp:trunk
seasharp:keyring
..
compare: seasharp:11d821da23c2cad70d8617f59fd444ce19334ddf
Branches Tags
seasharp:trunk
seasharp:keyring

No commits in common. "3f4240e093107d9184730adb635c309fe1c8d118" and "11d821da23c2cad70d8617f59fd444ce19334ddf" have entirely different histories.
3f4240e093 ... 11d821da23

2 changed files with 27 additions and 52 deletions
Show Stats Expand all files Collapse all files

52
modules/rosenthal/bootloader/limine.scm
View File

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

27
modules/rosenthal/packages/wm.scm
View File

@ -30,7 +30,6 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
@ -40,7 +39,7 @@
(define-public noctalia-shell (define-public noctalia-shell
(package (package
(name "noctalia-shell") (name "noctalia-shell")
(version "4.6.1") (version "4.5.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -49,7 +48,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"12plnkf46ncw9cx5mh2di23jvwd0hbxayr5bjlaj9blz63r10cjs")))) "1syqsml49jfjpngi7b099jcggp66lrls0ha6w5daqd5xhd2z94v3"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list (list
@ -136,10 +135,10 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
imagemagick imagemagick
khal khal
network-manager network-manager
noctalia-qs
python-minimal python-minimal
qtbase qtbase
qtwayland qtwayland
quickshell
which which
wl-clipboard wl-clipboard
wlsunset wlsunset
@ -152,23 +151,3 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
supporting various Wayland compositors like @code{niri}, @code{hyprland}, and supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
@code{sway}.") @code{sway}.")
(license license:expat))) (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)")))