freya/dotfiles-guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update channels, minor fixes

Browse source
This commit is contained in:
Freya Murphy 2024-03-06 18:56:31 -05:00
parent 2e19627dd7
commit 52d9af32d5
Signed by: freya
GPG key ID: 744AB800E383AE52
9 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
channels.scm
View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(branch "master") (branch "master")
(commit (commit
"3f83dc5587573f173b1f61864c9b510f05de84b1") "201f90f34f90242bb74baa5ca44bda6131b3a035")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix.git") (url "https://gitlab.com/nonguix/nonguix.git")
(branch "master") (branch "master")
(commit (commit
"def38a656de0a6a2aca7da59d2d6ff824782420c") "25bcda2b9107b948a1c858e41aba1b7f95b76228")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"

15
guix-strap/guix-crypt
View file

@ -13,6 +13,9 @@ EVENT "Setting up disk encryption with luks"
if [[ $DISK == "/dev/sd"* ]]; then if [[ $DISK == "/dev/sd"* ]]; then
CRYPT_PARTITION="$DISK""2" CRYPT_PARTITION="$DISK""2"
EFI_PARTITION="$DISK""1" EFI_PARTITION="$DISK""1"
elif [[ $DISK == "/dev/vd"* ]]; then
CRYPT_PARTITION="$DISK""2"
EFI_PARTITION="$DISK""1"
elif [[ $DISK == "/dev/nvme"* ]]; then elif [[ $DISK == "/dev/nvme"* ]]; then
CRYPT_PARTITION="$DISK""p2" CRYPT_PARTITION="$DISK""p2"
EFI_PARTITION="$DISK""p1" EFI_PARTITION="$DISK""p1"
@ -43,20 +46,20 @@ $PASSWORD
$PASSWORD_CONFIRM $PASSWORD_CONFIRM
EOF EOF
EVENT "Opening cryptroot" EVENT "Opening root"
cryptsetup open "$CRYPT_PARTITION" cryptroot <<EOF cryptsetup open "$CRYPT_PARTITION" root <<EOF
$PASSWORD $PASSWORD
EOF EOF
EVENT "Setting up cryptroot btrfs" EVENT "Setting up root btrfs"
mkfs.btrfs "/dev/mapper/cryptroot" mkfs.btrfs "/dev/mapper/root"
EVENT "Mounting cryptroot" EVENT "Mounting root"
mkdir -p /mnt mkdir -p /mnt
mount /dev/mapper/cryptroot /mnt mount /dev/mapper/root /mnt
EVENT "Setting up EFI vfat" EVENT "Setting up EFI vfat"

2
guix-strap/guix-setup
View file

@ -37,7 +37,7 @@ cleanup() {
umount /mnt/boot/efi umount /mnt/boot/efi
umount /mnt umount /mnt
umount /tmp umount /tmp
cryptsetup close cryptroot cryptsetup close root
} }
welcome welcome

4
guix-strap/system.scm
View file

@ -8,12 +8,12 @@
(mapped-devices (list (mapped-device (mapped-devices (list (mapped-device
(source (uuid (source (uuid
"SED_CRYPT_UUID")) "SED_CRYPT_UUID"))
(target "cryptroot") (target "root")
(type luks-device-mapping)))) (type luks-device-mapping))))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(mount-point "/") (mount-point "/")
(device "/dev/mapper/cryptroot") (device "/dev/mapper/root")
(type "btrfs") (type "btrfs")
(dependencies mapped-devices)) (dependencies mapped-devices))
(file-system (file-system

4
kaworu.scm
View file

@ -8,12 +8,12 @@
(mapped-devices (list (mapped-device (mapped-devices (list (mapped-device
(source (uuid (source (uuid
"89257280-202b-4565-b832-89f160d5e4e2")) "89257280-202b-4565-b832-89f160d5e4e2"))
(target "cryptroot") (target "root")
(type luks-device-mapping)))) (type luks-device-mapping))))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(mount-point "/") (mount-point "/")
(device "/dev/mapper/cryptroot") (device "/dev/mapper/root")
(type "btrfs") (type "btrfs")
(dependencies mapped-devices)) (dependencies mapped-devices))
(file-system (file-system

2
modules/home-packages/certs.scm
View file

@ -17,7 +17,7 @@
#:recursive? #t)) #:recursive? #t))
(build-system trivial-build-system) (build-system trivial-build-system)
(license license:mpl2.0) (license license:mpl2.0)
(home-page "https://tylerm.dev") (home-page "https://freya.cat")
(arguments (arguments
`(#:modules `(#:modules
((guix build utils)) ((guix build utils))

18
modules/home-packages/mozillia.scm
View file

@ -11,29 +11,15 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (nongnu packages mozilla)) #: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 (define-public firefox-wayland-new
(package (package
(inherit firefox*) (inherit firefox)
(name "firefox-wayland-new") (name "firefox-wayland-new")
(native-inputs '()) (native-inputs '())
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)
("pipewire" ,pipewire) ("pipewire" ,pipewire)
("firefox" ,firefox*))) ("firefox" ,firefox)))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
'(#:modules ((guix build utils)) '(#:modules ((guix build utils))

4
modules/home-packages/wm.scm
View file

@ -10,7 +10,7 @@
(define-public swaylock-effects-new (define-public swaylock-effects-new
(package (package
(inherit swaylock-effects) (inherit swaylock-effects)
(version "1.6.11") (version "1.7.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -18,5 +18,5 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) "0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj"))))
(inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam"))))) (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))

4
shinji.scm
View file

@ -14,12 +14,12 @@
(mapped-devices (list (mapped-device (mapped-devices (list (mapped-device
(source (uuid (source (uuid
"5c5dcb22-62b1-41af-9116-b8fdfba83ca2")) "5c5dcb22-62b1-41af-9116-b8fdfba83ca2"))
(target "cryptroot") (target "root")
(type luks-device-mapping)))) (type luks-device-mapping))))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(mount-point "/") (mount-point "/")
(device "/dev/mapper/cryptroot") (device "/dev/mapper/root")
(type "btrfs") (type "btrfs")
(dependencies mapped-devices)) (dependencies mapped-devices))
(file-system (file-system