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

update guixstrap

Browse source
This commit is contained in:
Freya Murphy 2024-06-21 14:13:42 -04:00
parent ec91773b25
commit 2077911805
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
guix-strap/guix-crypt
View file

@ -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,19 +46,19 @@ $PASSWORD
$PASSWORD_CONFIRM
EOF
EVENT "Opening cryptroot"
EVENT "Opening root"
cryptsetup open "$CRYPT_PARTITION" cryptroot <<EOF
cryptsetup open "$CRYPT_PARTITION" root <<EOF
$PASSWORD
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"
mount /dev/mapper/cryptroot /mnt
mount /dev/mapper/root /mnt
EVENT "Setting up EFI vfat"

4
guix-strap/system.scm
View file

@ -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