From 52d9af32d5d77b9db60819644f35fd470e12cee4 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Wed, 6 Mar 2024 18:56:31 -0500 Subject: [PATCH] update channels, minor fixes --- channels.scm | 4 ++-- guix-strap/guix-crypt | 15 +++++++++------ guix-strap/guix-setup | 4 ++-- guix-strap/system.scm | 6 +++--- kaworu.scm | 4 ++-- modules/home-packages/certs.scm | 2 +- modules/home-packages/mozillia.scm | 18 ++---------------- modules/home-packages/wm.scm | 4 ++-- shinji.scm | 6 +++--- 9 files changed, 26 insertions(+), 37 deletions(-) diff --git a/channels.scm b/channels.scm index 6e28141..bb82650 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "3f83dc5587573f173b1f61864c9b510f05de84b1") + "201f90f34f90242bb74baa5ca44bda6131b3a035") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" @@ -14,7 +14,7 @@ (url "https://gitlab.com/nonguix/nonguix.git") (branch "master") (commit - "def38a656de0a6a2aca7da59d2d6ff824782420c") + "25bcda2b9107b948a1c858e41aba1b7f95b76228") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" diff --git a/guix-strap/guix-crypt b/guix-strap/guix-crypt index 90bb545..f1251a5 100755 --- a/guix-strap/guix-crypt +++ b/guix-strap/guix-crypt @@ -13,6 +13,9 @@ EVENT "Setting up disk encryption with luks" if [[ $DISK == "/dev/sd"* ]]; then CRYPT_PARTITION="$DISK""2" EFI_PARTITION="$DISK""1" +elif [[ $DISK == "/dev/vd"* ]]; then + CRYPT_PARTITION="$DISK""2" + EFI_PARTITION="$DISK""1" elif [[ $DISK == "/dev/nvme"* ]]; then CRYPT_PARTITION="$DISK""p2" EFI_PARTITION="$DISK""p1" @@ -43,20 +46,20 @@ $PASSWORD $PASSWORD_CONFIRM EOF -EVENT "Opening cryptroot" +EVENT "Opening root" -cryptsetup open "$CRYPT_PARTITION" cryptroot < ./guix-env -echo "" > ./guix-env +echo "" > ./guix-env welcome() { cat<<"EOF" @@ -37,7 +37,7 @@ cleanup() { umount /mnt/boot/efi umount /mnt umount /tmp - cryptsetup close cryptroot + cryptsetup close root } welcome diff --git a/guix-strap/system.scm b/guix-strap/system.scm index 722edef..0376dcf 100644 --- a/guix-strap/system.scm +++ b/guix-strap/system.scm @@ -8,12 +8,12 @@ (mapped-devices (list (mapped-device (source (uuid "SED_CRYPT_UUID")) - (target "cryptroot") + (target "root") (type luks-device-mapping)))) - + (file-systems (cons* (file-system (mount-point "/") - (device "/dev/mapper/cryptroot") + (device "/dev/mapper/root") (type "btrfs") (dependencies mapped-devices)) (file-system diff --git a/kaworu.scm b/kaworu.scm index 1d0203d..253f9b1 100644 --- a/kaworu.scm +++ b/kaworu.scm @@ -8,12 +8,12 @@ (mapped-devices (list (mapped-device (source (uuid "89257280-202b-4565-b832-89f160d5e4e2")) - (target "cryptroot") + (target "root") (type luks-device-mapping)))) (file-systems (cons* (file-system (mount-point "/") - (device "/dev/mapper/cryptroot") + (device "/dev/mapper/root") (type "btrfs") (dependencies mapped-devices)) (file-system diff --git a/modules/home-packages/certs.scm b/modules/home-packages/certs.scm index 5e356f8..442c8b2 100644 --- a/modules/home-packages/certs.scm +++ b/modules/home-packages/certs.scm @@ -17,7 +17,7 @@ #:recursive? #t)) (build-system trivial-build-system) (license license:mpl2.0) - (home-page "https://tylerm.dev") + (home-page "https://freya.cat") (arguments `(#:modules ((guix build utils)) diff --git a/modules/home-packages/mozillia.scm b/modules/home-packages/mozillia.scm index a7d8763..1597fb8 100644 --- a/modules/home-packages/mozillia.scm +++ b/modules/home-packages/mozillia.scm @@ -11,29 +11,15 @@ #:use-module (guix build-system trivial) #:use-module (nongnu packages mozilla)) -(define firefox* - (package/inherit - firefox - (inputs - (modify-inputs - (package-inputs firefox) - (delete "pipewire") - (append pipewire))) - (arguments - (substitute-keyword-arguments (package-arguments firefox) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'check))))))) - (define-public firefox-wayland-new (package - (inherit firefox*) + (inherit firefox) (name "firefox-wayland-new") (native-inputs '()) (inputs `(("bash" ,bash-minimal) ("pipewire" ,pipewire) - ("firefox" ,firefox*))) + ("firefox" ,firefox))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) diff --git a/modules/home-packages/wm.scm b/modules/home-packages/wm.scm index 9de5dc0..6443808 100644 --- a/modules/home-packages/wm.scm +++ b/modules/home-packages/wm.scm @@ -10,7 +10,7 @@ (define-public swaylock-effects-new (package (inherit swaylock-effects) - (version "1.6.11") + (version "1.7.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -18,5 +18,5 @@ (commit (string-append "v" version)))) (sha256 (base32 - "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) + "0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj")))) (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam"))))) diff --git a/shinji.scm b/shinji.scm index 75a5ba9..78eae55 100644 --- a/shinji.scm +++ b/shinji.scm @@ -14,12 +14,12 @@ (mapped-devices (list (mapped-device (source (uuid "5c5dcb22-62b1-41af-9116-b8fdfba83ca2")) - (target "cryptroot") + (target "root") (type luks-device-mapping)))) - + (file-systems (cons* (file-system (mount-point "/") - (device "/dev/mapper/cryptroot") + (device "/dev/mapper/root") (type "btrfs") (dependencies mapped-devices)) (file-system