diff --git a/hosts/Infini-DESKTOP/install.bash b/hosts/Infini-DESKTOP/install.bash
index 6168aa2..0d0859a 100755
--- a/hosts/Infini-DESKTOP/install.bash
+++ b/hosts/Infini-DESKTOP/install.bash
@@ -3,7 +3,7 @@
 # [[[[file:/etc/nixos/hosts/Infini-DESKTOP/readme.org::mount][mount]]][mount]]
 # [[[[file:/etc/nixos/hosts/Infini-DESKTOP/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -21,9 +21,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
@@ -31,7 +31,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
 # mounting ends here
 # mount ends here
 
diff --git a/hosts/Infini-DESKTOP/mount.bash b/hosts/Infini-DESKTOP/mount.bash
index 1f32e48..db23d31 100755
--- a/hosts/Infini-DESKTOP/mount.bash
+++ b/hosts/Infini-DESKTOP/mount.bash
@@ -2,7 +2,7 @@
 # [[file:readme.org::mount][mount]]
 # [[[[file:/etc/nixos/hosts/Infini-DESKTOP/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -20,9 +20,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
@@ -30,6 +30,6 @@ 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
 # mounting ends here
 # mount ends here
diff --git a/hosts/Infini-DESKTOP/prep.bash b/hosts/Infini-DESKTOP/prep.bash
index 2697d2c..a8f7adf 100755
--- a/hosts/Infini-DESKTOP/prep.bash
+++ b/hosts/Infini-DESKTOP/prep.bash
@@ -2,7 +2,7 @@
 # [[file:readme.org::preparation][preparation]]
 # [[[[file:/etc/nixos/hosts/Infini-DESKTOP/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -20,17 +20,17 @@ sudo parted $DISK -s -- set 1 esp on
 
 # [[[[file:/etc/nixos/hosts/Infini-DESKTOP/readme.org::filesystems][filesystems]]][filesystems]]
 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"
 # filesystems ends here
 
 # [[[[file:/etc/nixos/hosts/Infini-DESKTOP/readme.org::subvolumes][subvolumes]]][subvolumes]]
-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
diff --git a/hosts/Infini-DESKTOP/readme.org b/hosts/Infini-DESKTOP/readme.org
index dd568f6..e7dfd6d 100644
--- a/hosts/Infini-DESKTOP/readme.org
+++ b/hosts/Infini-DESKTOP/readme.org
@@ -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
diff --git a/hosts/Infini-SERVER/data_setup.bash b/hosts/Infini-SERVER/data_setup.bash
index 49d83d5..564eb37 100755
--- a/hosts/Infini-SERVER/data_setup.bash
+++ b/hosts/Infini-SERVER/data_setup.bash
@@ -2,7 +2,7 @@
 # [[file:readme.org::data_setup][data_setup]]
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -22,13 +22,13 @@ sudo parted $DISK -s -- mkpart primary btrfs 0% 100%
 
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::data_filesystems][data_filesystems]]][data_filesystems]]
 echo "LOG: Making data filesystems"
-echo "- Making btrfa filesystem on ${DISK}${PARTITION_PREFIX}1"
-sudo mkfs.btrfs "${DISK}${PARTITION_PREFIX}1" --csum xxhash -L "data" -f
+echo "- Making btrfa filesystem on ${PART}1"
+sudo mkfs.btrfs "${PART}1" --csum xxhash -L "data" -f
 # data_filesystems ends here
 
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::data_subvolumes][data_subvolumes]]][data_subvolumes]]
-echo "LOG: Making data subvolumes on ${DISK}${PARTITION_PREFIX}1"
-sudo mount "${DISK}${PARTITION_PREFIX}1" /mnt
+echo "LOG: Making data subvolumes on ${PART}1"
+sudo mount "${PART}1" /mnt
 sudo btrfs subvolume create /mnt/root
 sudo btrfs subvolume create /mnt/root/srv
 sudo btrfs subvolume create /mnt/root/srv/minecraft
diff --git a/hosts/Infini-SERVER/install.bash b/hosts/Infini-SERVER/install.bash
index 6e24bfe..c7657b1 100755
--- a/hosts/Infini-SERVER/install.bash
+++ b/hosts/Infini-SERVER/install.bash
@@ -3,7 +3,7 @@
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::mount][mount]]][mount]]
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -21,9 +21,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
@@ -31,7 +31,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
 # mounting ends here
 # mount ends here
 
diff --git a/hosts/Infini-SERVER/mount.bash b/hosts/Infini-SERVER/mount.bash
index 3eb79b3..9cdb81b 100755
--- a/hosts/Infini-SERVER/mount.bash
+++ b/hosts/Infini-SERVER/mount.bash
@@ -2,7 +2,7 @@
 # [[file:readme.org::mount][mount]]
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -20,9 +20,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
@@ -30,6 +30,6 @@ 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
 # mounting ends here
 # mount ends here
diff --git a/hosts/Infini-SERVER/prep.bash b/hosts/Infini-SERVER/prep.bash
index 95c7b99..fb38ab6 100755
--- a/hosts/Infini-SERVER/prep.bash
+++ b/hosts/Infini-SERVER/prep.bash
@@ -2,7 +2,7 @@
 # [[file:readme.org::preparation][preparation]]
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::boilerplate][boilerplate]]][boilerplate]]
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 # boilerplate ends here
@@ -20,17 +20,17 @@ sudo parted $DISK -s -- set 1 esp on
 
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::filesystems][filesystems]]][filesystems]]
 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-SERVER" -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-SERVER" -f
+echo "- Making swap space on ${PART}3"
+sudo mkswap -L swap "${PART}3"
 # filesystems ends here
 
 # [[[[file:/etc/nixos/hosts/Infini-SERVER/readme.org::subvolumes][subvolumes]]][subvolumes]]
-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
diff --git a/hosts/Infini-SERVER/readme.org b/hosts/Infini-SERVER/readme.org
index 1419af9..3295995 100644
--- a/hosts/Infini-SERVER/readme.org
+++ b/hosts/Infini-SERVER/readme.org
@@ -74,7 +74,7 @@ Setup for my main server hosting computer, using an Nvidia GPU and the =server=
 #+NAME: boilerplate
 #+BEGIN_SRC bash
 DISK=$1
-PARTITION_PREFIX=$2
+PART=$DISK$2
 
 sudo mkdir -p /mnt
 #+END_SRC
@@ -104,20 +104,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-SERVER" -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-SERVER" -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
@@ -137,9 +137,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
@@ -147,7 +147,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
@@ -195,16 +195,16 @@ sudo parted $DISK -s -- mkpart primary btrfs 0% 100%
 #+NAME: data_filesystems
 #+BEGIN_SRC bash
 echo "LOG: Making data filesystems"
-echo "- Making btrfa filesystem on ${DISK}${PARTITION_PREFIX}1"
-sudo mkfs.btrfs "${DISK}${PARTITION_PREFIX}1" --csum xxhash -L "data" -f
+echo "- Making btrfa filesystem on ${PART}1"
+sudo mkfs.btrfs "${PART}1" --csum xxhash -L "data" -f
 #+END_SRC
 
 *** Making Subvolumes
 
 #+NAME: data_subvolumes
 #+BEGIN_SRC bash
-echo "LOG: Making data subvolumes on ${DISK}${PARTITION_PREFIX}1"
-sudo mount "${DISK}${PARTITION_PREFIX}1" /mnt
+echo "LOG: Making data subvolumes on ${PART}1"
+sudo mount "${PART}1" /mnt
 sudo btrfs subvolume create /mnt/root
 sudo btrfs subvolume create /mnt/root/srv
 sudo btrfs subvolume create /mnt/root/srv/minecraft
@@ -227,6 +227,6 @@ sudo parted $DISK -s -- mkpart primary btrfs 0% 100%
 #+NAME: backup_filesystems
 #+BEGIN_SRC bash
 echo "LOG: Making backup filesystems"
-echo "- Making btrfa filesystem on ${DISK}${PARTITION_PREFIX}1"
-sudo mkfs.btrfs "${DISK}${PARTITION_PREFIX}1" --csum xxhash -L "backup"
+echo "- Making btrfa filesystem on ${PART}1"
+sudo mkfs.btrfs "${PART}1" --csum xxhash -L "backup"
 #+END_SRC