refactor(setup): improve handling of partition prefix

This commit is contained in:
Infinidoge 2022-05-09 13:24:56 -04:00
parent 969e644e74
commit ccd0bc0a54
9 changed files with 75 additions and 75 deletions

View file

@ -61,7 +61,7 @@ Setup for my main desktop computer, using an Nvidia GPU and the =desktop= form f
#+NAME: boilerplate
#+BEGIN_SRC bash
DISK=$1
PARTITION_PREFIX=$2
PART=$DISK$2
sudo mkdir -p /mnt
#+END_SRC
@ -91,20 +91,20 @@ sudo parted $DISK -s -- set 1 esp on
#+NAME: filesystems
#+BEGIN_SRC bash
echo "LOG: Making filesystems"
echo "- Making fat32 filesystem on ${DISK}${PARTITION_PREFIX}1"
sudo mkfs.fat -F 32 -n boot "${DISK}${PARTITION_PREFIX}1"
echo "- Making btrfs filesystem on ${DISK}${PARTITION_PREFIX}2"
sudo mkfs.btrfs "${DISK}${PARTITION_PREFIX}2" -L "Infini-DESKTOP" -f
echo "- Making swap space on ${DISK}${PARTITION_PREFIX}3"
sudo mkswap -L swap "${DISK}${PARTITION_PREFIX}3"
echo "- Making fat32 filesystem on ${PART}1"
sudo mkfs.fat -F 32 -n boot "${PART}1"
echo "- Making btrfs filesystem on ${PART}2"
sudo mkfs.btrfs "${PART}2" -L "Infini-DESKTOP" -f
echo "- Making swap space on ${PART}3"
sudo mkswap -L swap "${PART}3"
#+END_SRC
** Making Subvolumes
#+NAME: subvolumes
#+BEGIN_SRC bash
echo "LOG: Making subvolumes on ${DISK}${PARTITION_PREFIX}2"
sudo mount "${DISK}${PARTITION_PREFIX}2" /mnt
echo "LOG: Making subvolumes on ${PART}2"
sudo mount "${PART}2" /mnt
sudo btrfs subvolume create /mnt/root
sudo btrfs subvolume create /mnt/root/home
sudo mkdir -p /mnt/root/etc
@ -124,9 +124,9 @@ sudo mount -t tmpfs root /mnt
echo "LOG: - Mounting persistent directories"
sudo mkdir -p /mnt/persist /mnt/nix /mnt/boot
sudo mount -o subvol=root,autodefrag,noatime "${DISK}${PARTITION_PREFIX}2" /mnt/persist
sudo mount -o subvol=nix,autodefrag,noatime "${DISK}${PARTITION_PREFIX}2" /mnt/nix
sudo mount -o subvol=boot,autodefrag,noatime "${DISK}${PARTITION_PREFIX}2" /mnt/boot
sudo mount -o subvol=root,autodefrag,noatime "${PART}2" /mnt/persist
sudo mount -o subvol=nix,autodefrag,noatime "${PART}2" /mnt/nix
sudo mount -o subvol=boot,autodefrag,noatime "${PART}2" /mnt/boot
echo "LOG: - - Mounting persistent subdirectories"
sudo mkdir -p /mnt/home
@ -134,7 +134,7 @@ sudo mount --bind /mnt/persist/home /mnt/home
echo "LOG: - Mounting EFI System Partition"
sudo mkdir -p /mnt/boot/efi
sudo mount "${DISK}${PARTITION_PREFIX}1" /mnt/boot/efi
sudo mount "${PART}1" /mnt/boot/efi
#+END_SRC
** Installing