From 2c6cde2ef72e3cd3df874f549204e9b0fb71aad1 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 19:51:10 +0000
Subject: [PATCH 01/24] Update install.sh

---
 install.sh | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/install.sh b/install.sh
index b3dd4ca..e5d6ea2 100644
--- a/install.sh
+++ b/install.sh
@@ -14,10 +14,6 @@ read driveName
 
 (
 echo g       # Create new GPT partition table
-echo n       # Create new partition (for EFI).
-echo         # Set default partition number.
-echo         # Set default first sector.
-echo +1G     # Set +1G as last sector.
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
@@ -26,21 +22,13 @@ echo n       # Create new partition (for swap).
 echo         # Set default partition number.
 echo         # Set default first sector.
 echo         # Set default last sector (rest of the disk).
-echo t       # Change partition type.
-echo 1       # Pick first partition.
-echo 1       # Change first partition to EFI system.
+
 echo w       # write changes. 
 ) | sudo fdisk $driveName -w always -W always
 
 # List the new partitions.
 lsblk -f
 
-# Format the partitions :
-echo "----------"
-echo ""
-echo "Which is the EFI partition?"
-read efiName
-
 echo ""
 echo "Which is the root partition?"
 read rootName
@@ -49,10 +37,7 @@ echo ""
 echo "Do you want Hibernation?"
 echo "1) Yes"
 echo "2) No"
-read hibState
-
-# Create EFI partition
-sudo mkfs.fat -F32 -n EFI $efiName         
+read hibState      
 
 # Encrypt the root partition
 sudo cryptsetup luksFormat -v -s 512 -h sha512 $rootName
@@ -100,10 +85,6 @@ sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@ /dev/lvm/root /mnt
 sudo mkdir /mnt/home/
 sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@home /dev/lvm/root /mnt/home
 
-# Mount the EFI partition.
-sudo mkdir /mnt/boot/
-sudo mount $efiName /mnt/boot
-
 # Generate Nix configuration
 sudo nixos-generate-config --root /mnt
 
@@ -113,7 +94,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/php.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""

From 340e47060b2207fba8e62bbf18f7be49751760a5 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 20:05:10 +0000
Subject: [PATCH 02/24] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index e5d6ea2..ab91067 100644
--- a/install.sh
+++ b/install.sh
@@ -17,7 +17,7 @@ echo g       # Create new GPT partition table
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
-echo         # Set last sector.
+echo -8G     # Set last sector.
 echo n       # Create new partition (for swap).
 echo         # Set default partition number.
 echo         # Set default first sector.

From 72c9ad36903272b53ba9eddcac0d5861d90bf10f Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 20:08:26 +0000
Subject: [PATCH 03/24] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index ab91067..1941117 100644
--- a/install.sh
+++ b/install.sh
@@ -94,7 +94,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/php.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pbp.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""

From e01bc41ff58ef344983c2dd8e47802e4c8ced2ff Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 20:10:00 +0000
Subject: [PATCH 04/24] Update install.sh

---
 install.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/install.sh b/install.sh
index 1941117..0bcd3f3 100644
--- a/install.sh
+++ b/install.sh
@@ -17,10 +17,6 @@ echo g       # Create new GPT partition table
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
-echo -8G     # Set last sector.
-echo n       # Create new partition (for swap).
-echo         # Set default partition number.
-echo         # Set default first sector.
 echo         # Set default last sector (rest of the disk).
 
 echo w       # write changes. 

From bd1745d03c564c734e617de66cd0b74bf66d6374 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 20:11:23 +0000
Subject: [PATCH 05/24] Update install.sh

---
 install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.sh b/install.sh
index 0bcd3f3..590f1b3 100644
--- a/install.sh
+++ b/install.sh
@@ -97,6 +97,7 @@ echo ""
 echo "Which Desktop Environment do you want?"
 echo "1) Plasma"
 echo "2) GNOME"
+echo "0) None or N/A"
 read desktopChoice
 
 # Change the URL to match where you are hosting your DE/WM .nix file

From a45782b7c8e96e60b27f09030aca218e735a28b9 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 20:58:53 +0000
Subject: [PATCH 06/24] Update install.sh

---
 install.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/install.sh b/install.sh
index 590f1b3..caac8d6 100644
--- a/install.sh
+++ b/install.sh
@@ -14,6 +14,10 @@ read driveName
 
 (
 echo g       # Create new GPT partition table
+echo n       # Create new partition (for EFI).
+echo         # Set default partition number.
+echo         # Set default first sector.
+echo +1G     # Set +1G as last sector.
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
@@ -25,6 +29,12 @@ echo w       # write changes.
 # List the new partitions.
 lsblk -f
 
+# Format the partitions :
+echo "----------"
+echo ""
+echo "Which is the EFI partition?"
+read efiName
+
 echo ""
 echo "Which is the root partition?"
 read rootName
@@ -35,6 +45,9 @@ echo "1) Yes"
 echo "2) No"
 read hibState      
 
+# Create EFI partition
+sudo mkfs.fat -F32 -n EFI $efiName       
+
 # Encrypt the root partition
 sudo cryptsetup luksFormat -v -s 512 -h sha512 $rootName
 

From 8850925b7ec5444c7eb83e2400c210939f6a7de1 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 5 Dec 2022 21:28:41 +0000
Subject: [PATCH 07/24] Update install.sh

---
 install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install.sh b/install.sh
index caac8d6..c3b2090 100644
--- a/install.sh
+++ b/install.sh
@@ -94,6 +94,10 @@ sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@ /dev/lvm/root /mnt
 sudo mkdir /mnt/home/
 sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@home /dev/lvm/root /mnt/home
 
+# Mount the EFI partition.
+sudo mkdir /mnt/boot/
+sudo mount $efiName /mnt/boot
+
 # Generate Nix configuration
 sudo nixos-generate-config --root /mnt
 

From 8bd99cc405ff8406a3d82e7058d4e68916d63790 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 6 Dec 2022 16:37:45 +0000
Subject: [PATCH 08/24] Update install.sh

---
 install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index c3b2090..5a220b6 100644
--- a/install.sh
+++ b/install.sh
@@ -22,7 +22,9 @@ echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
 echo         # Set default last sector (rest of the disk).
-
+echo t       # Change partition type.
+echo 1       # Pick first partition.
+echo 1       # Change first partition to EFI system.
 echo w       # write changes. 
 ) | sudo fdisk $driveName -w always -W always
 

From b795982d26bff20d38ec0b7b7a9dcb80ee70c6b4 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 12 Jan 2023 09:06:43 -0700
Subject: [PATCH 09/24] Fix order

---
 install.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 5a220b6..a2d86b2 100644
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@ echo "Which drive do we want to use for this installation?"
 read driveName
 
 (
-echo g       # Create new GPT partition table
+echo g       # Create new GPT partition table.
 echo n       # Create new partition (for EFI).
 echo         # Set default partition number.
 echo         # Set default first sector.
@@ -21,9 +21,17 @@ echo +1G     # Set +1G as last sector.
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
-echo         # Set default last sector (rest of the disk).
+echo -8G     # Set -8G as the last sector.
+echo n       # Create new partiton (for Swap).
+echo         # Set default partiion number.
+echo         # Set default first sector.
+echo         # Set default last sector.
 echo t       # Change partition type.
 echo 1       # Pick first partition.
+echo 1       # Change to EFI System.
+echo t       # Change partition type.
+echo 3       # Pick last partition.
+echo 19      # change to Linux wwap.
 echo 1       # Change first partition to EFI system.
 echo w       # write changes. 
 ) | sudo fdisk $driveName -w always -W always

From 5a5305f7507fb85c29a7c695c54ad917cbed9c04 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 12 Jan 2023 10:31:35 -0700
Subject: [PATCH 10/24] Update path with new filename

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index a2d86b2..406ac17 100644
--- a/install.sh
+++ b/install.sh
@@ -117,7 +117,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pbp.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pinebook-pro.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""

From 7ba677837c6d1a920c56e00fb44c1c87b363b681 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Sun, 15 Jan 2023 14:57:34 +0000
Subject: [PATCH 11/24] Update install.sh

---
 install.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index 406ac17..78aefd5 100644
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@ echo "Which drive do we want to use for this installation?"
 read driveName
 
 (
-echo g       # Create new GPT partition table.
+echo g       # Create new GPT partition table
 echo n       # Create new partition (for EFI).
 echo         # Set default partition number.
 echo         # Set default first sector.
@@ -21,17 +21,9 @@ echo +1G     # Set +1G as last sector.
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
-echo -8G     # Set -8G as the last sector.
-echo n       # Create new partiton (for Swap).
-echo         # Set default partiion number.
-echo         # Set default first sector.
-echo         # Set default last sector.
+echo         # Set last sector.
 echo t       # Change partition type.
 echo 1       # Pick first partition.
-echo 1       # Change to EFI System.
-echo t       # Change partition type.
-echo 3       # Pick last partition.
-echo 19      # change to Linux wwap.
 echo 1       # Change first partition to EFI system.
 echo w       # write changes. 
 ) | sudo fdisk $driveName -w always -W always

From f84b30afd03c7b8a8805e27a38e87b9c253e3d27 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 16 Jan 2023 19:11:16 +0000
Subject: [PATCH 12/24] Update install.sh

---
 install.sh | 66 ++++++++++++++----------------------------------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/install.sh b/install.sh
index 78aefd5..4d65472 100644
--- a/install.sh
+++ b/install.sh
@@ -21,10 +21,13 @@ echo +1G     # Set +1G as last sector.
 echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
-echo         # Set last sector.
+echo -4G     # Set last sector.
 echo t       # Change partition type.
 echo 1       # Pick first partition.
 echo 1       # Change first partition to EFI system.
+echo t       # Change partition type.
+echo 3       # Pick the last partition. 
+echo 19      # Change last partition to Swap.
 echo w       # write changes. 
 ) | sudo fdisk $driveName -w always -W always
 
@@ -42,60 +45,23 @@ echo "Which is the root partition?"
 read rootName
 
 echo ""
-echo "Do you want Hibernation?"
-echo "1) Yes"
-echo "2) No"
-read hibState      
+echo "Which is the swap partition?"
+read swapName
 
 # Create EFI partition
 sudo mkfs.fat -F32 -n EFI $efiName       
 
-# Encrypt the root partition
-sudo cryptsetup luksFormat -v -s 512 -h sha512 $rootName
-
-# Open the encrypted root partition
-sudo cryptsetup luksOpen $rootName crypt-root
-
-sudo pvcreate /dev/mapper/crypt-root
-sudo vgcreate lvm /dev/mapper/crypt-root
-
-if [ $hibState = 1 ]; then
-   sudo lvcreate -L "$ramTotal"G -n swap lvm
-
-else
-
-if [ $hibState = 2 ]; then
-   sudo lvcreate -L 4G -n swap lvm
-
-fi
-
-fi
-
-sudo lvcreate -l '100%FREE' -n root lvm
-
-# sudo btrfs filesystem label $rootName luks
-# sudo cryptsetup config $rootName --label luks
-
-sudo mkswap /dev/lvm/swap              # swap partition
-sudo mkfs.btrfs -L root /dev/lvm/root  # /root partition
+sudo mkswap $swapName      # swap partition
+sudo mkfs.ext4 $rootName   # /root partition
+sudo e2label $rootName NixOS
 
 # 0. Mount the filesystems.
-sudo swapon /dev/lvm/swap
-sudo mount /dev/lvm/root /mnt
-
-# Create Subvolumes
-sudo btrfs subvolume create /mnt/@
-sudo btrfs subvolume create /mnt/@home
+sudo swapon $swapName
+sudo mount $rootName /mnt
 
 # Unmount root
 sudo umount /mnt
 
-# Mount the subvolumes.
-sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@ /dev/lvm/root /mnt
-
-sudo mkdir /mnt/home/
-sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@home /dev/lvm/root /mnt/home
-
 # Mount the EFI partition.
 sudo mkdir /mnt/boot/
 sudo mount $efiName /mnt/boot
@@ -109,7 +75,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pinebook-pro.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""
@@ -138,6 +104,7 @@ echo ""
 echo "Which device are you installing to?"
 echo "1) Oryx Pro (oryp6)"
 echo "2) HP Omen (15-dh0015nr)"
+echo "3) Pinebook Pro"
 echo "0) None or N/A"
 read deviceChoice
 
@@ -152,12 +119,13 @@ else
 if [ $deviceChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/hp-omen.nix > hp-omen.nix; sudo mv -f hp-omen.nix /mnt/etc/nixos/
    sudo sed -i "11 i \           ./hp-omen.nix" /mnt/etc/nixos/configuration.nix 
+else
+
+if [ $deviceChoice = 3 ]; then
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pinebook-pro.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 fi
 
 fi
 
-# Replace LUKS device with correct partition
-sudo sed -i "s|/dev/disk/by-label/luks|$rootName|g" /mnt/etc/nixos/configuration.nix
-
 # Install
 sudo nixos-install

From 0b4e2b1129f900ce5a8cee15453d567053663ca9 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 16 Jan 2023 19:44:34 +0000
Subject: [PATCH 13/24] Update install.sh

---
 install.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/install.sh b/install.sh
index 4d65472..bfdc52e 100644
--- a/install.sh
+++ b/install.sh
@@ -82,6 +82,7 @@ echo ""
 echo "Which Desktop Environment do you want?"
 echo "1) Plasma"
 echo "2) GNOME"
+echo "3) Pantheon"
 echo "0) None or N/A"
 read desktopChoice
 
@@ -96,6 +97,13 @@ else
 if [ $desktopChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo sed -i "10 i \           ./gnome.nix" /mnt/etc/nixos/configuration.nix
+else
+
+if [ $desktopChoice = 3 ]; then
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/pantheon.nix > pantheon.nix; sudo mv -f pantheon.nix /mnt/etc/nixos/
+   sudo sed -i "10 i \           ./pantheon.nix" /mnt/etc/nixos/configuration.nix
+else
+
 fi
 
 fi

From b9f6020df85df10a4086e542e03e265e571ce7c2 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 17 Jan 2023 22:15:36 +0000
Subject: [PATCH 14/24] Update README.md

---
 README.md | 51 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index e29351e..a4c73e3 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,9 @@ nix files are from [this repo](https://gitlab.com/ahoneybun/nix-configs/) but th
 Tested on the following drives:
 - SATA 
 - NVMe
+- eMMC
+
+Tested on x86_64 and aarch64 machines.
 
 This sets the hashedPassword to my own so you will need to update it to match your own as well as the username. I created the hash with this command:
 
@@ -32,34 +35,52 @@ Prerequisites:
 
 ## Connect to internet
 
+```sh
+> add_network
+0
+> set_network 0 ssid "myhomenetwork"
+OK
+> set_network 0 psk "mypassword"
+OK
+> set_network 0 key_mgmt WPA-PSK
+OK
+> enable_network 0
+OK
+```
+
 https://nixos.org/manual/nixos/stable/index.html#sec-installation-booting-networking
 
 ## Start the installer
 
-```
-curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/install.sh > install.sh; sh install.sh
-```
-
-or
-
-```
-sh <(curl -L https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/install.sh)
+```sh
+sh <(curl -L https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main-pbp/install.sh)
 ```
 
 The following will happen:
 
+### x86_64 - main branch
+
 - Clear partition table for `/dev/***`.
 - Creates a GPT partition table for `/dev/***`.
-- Create a 1GB EFI partiton at `/dev/***1`.
-- Create a encrypted LVM at `/dev/***2`.
-- Create a swap partition in the LVM and sets it as the same size as the RAM for hibernation if requested.
-- Create a root partition in the LVM.
-- Install systemd-boot.
+- Creates a 1GB EFI partiton at `/dev/***1`.
+- Creates a encrypted LVM at `/dev/***2`.
+- Creates a swap partition in the LVM and sets it as the same size as the RAM for hibernation if requested.
+- Creates a root partition in the LVM.
+- Installs systemd-boot
+
+### ARM64 (Pinebook Pro) - main-pbp branch 
+
+- Clear partition table for `/dev/***`. 
+- Creates a GPT partition table for `/dev/***`.
+- Creates a 1GB EFI partiton at `/dev/***1`.
+- Creates a 4GB Swap partition at `/dev/***3`.
+- Creates a root partition with the rest of the space at `/dev/***2`.
+- Installs GRUB
 
 ## Roadmap
 
-- [ ] 
+- [ ] Merge ARM64 and x86_64 together into one branch
 
 # Possible Ideas
 
-- [ ] 
+- [ ] Install nix-channels such as `nixos-hardware` and `home-manager` after install.

From a4d929ac826995e2058ed8b4acba186d759d5176 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 17 Jan 2023 22:16:37 +0000
Subject: [PATCH 15/24] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4c73e3..4b2b41d 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,9 @@ Tested on the following drives:
 - NVMe
 - eMMC
 
-Tested on x86_64 and aarch64 machines.
+Tested on the following architectures
+- x86_64 
+- aarch64 
 
 This sets the hashedPassword to my own so you will need to update it to match your own as well as the username. I created the hash with this command:
 

From 160d5135d031b358e6a309ad98071b3d18d8b861 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 17 Jan 2023 22:17:47 +0000
Subject: [PATCH 16/24] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4b2b41d..2fc56b8 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Tested on the following drives:
 - NVMe
 - eMMC
 
-Tested on the following architectures
+Tested on the following architectures:
 - x86_64 
 - aarch64 
 

From 68c4914d01c67b36b0c83aa28f9eb08fcb8adcc0 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:11:55 +0000
Subject: [PATCH 17/24] Update install.sh

---
 install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install.sh b/install.sh
index bfdc52e..533dd0e 100644
--- a/install.sh
+++ b/install.sh
@@ -22,6 +22,10 @@ echo n       # Create new partition (for root).
 echo         # Set default partition number.
 echo         # Set default first sector.
 echo -4G     # Set last sector.
+echo n       # Create Swap partition
+echo         # Set default partition number.
+echo         # Set default first sector.
+echo         # Set last sector.
 echo t       # Change partition type.
 echo 1       # Pick first partition.
 echo 1       # Change first partition to EFI system.

From bf04a0badca8928be4780c0bf352f7912dc90379 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:13:55 +0000
Subject: [PATCH 18/24] Update install.sh

---
 install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 533dd0e..14d2bd4 100644
--- a/install.sh
+++ b/install.sh
@@ -130,11 +130,12 @@ else
 
 if [ $deviceChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/hp-omen.nix > hp-omen.nix; sudo mv -f hp-omen.nix /mnt/etc/nixos/
-   sudo sed -i "11 i \           ./hp-omen.nix" /mnt/etc/nixos/configuration.nix 
+   sudo sed -i "10 i \           ./hp-omen.nix" /mnt/etc/nixos/configuration.nix 
 else
 
 if [ $deviceChoice = 3 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pinebook-pro.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pinebook-pro.nix > pinebook-pro.nix; sudo mv -f pinebook-pro.nix /mnt/etc/nixos/
+   sudo sed -i "10 i \           ./pinebook-pro.nix" /mnt/etc/nixos/configuration.nix 
 fi
 
 fi

From cd61733b7b622a8dd460c4bc1a9e8507eaa9e00d Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:15:13 +0000
Subject: [PATCH 19/24] Update install.sh

---
 install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/install.sh b/install.sh
index 14d2bd4..db63359 100644
--- a/install.sh
+++ b/install.sh
@@ -106,8 +106,6 @@ else
 if [ $desktopChoice = 3 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/pantheon.nix > pantheon.nix; sudo mv -f pantheon.nix /mnt/etc/nixos/
    sudo sed -i "10 i \           ./pantheon.nix" /mnt/etc/nixos/configuration.nix
-else
-
 fi
 
 fi

From 7e5eb4f22807291e08521e6fa603209dcde17efd Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:16:26 +0000
Subject: [PATCH 20/24] Update install.sh

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index db63359..449686c 100644
--- a/install.sh
+++ b/install.sh
@@ -101,7 +101,7 @@ else
 if [ $desktopChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo sed -i "10 i \           ./gnome.nix" /mnt/etc/nixos/configuration.nix
-else
+fi
 
 if [ $desktopChoice = 3 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/pantheon.nix > pantheon.nix; sudo mv -f pantheon.nix /mnt/etc/nixos/
@@ -129,7 +129,7 @@ else
 if [ $deviceChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/hp-omen.nix > hp-omen.nix; sudo mv -f hp-omen.nix /mnt/etc/nixos/
    sudo sed -i "10 i \           ./hp-omen.nix" /mnt/etc/nixos/configuration.nix 
-else
+fi
 
 if [ $deviceChoice = 3 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/pinebook-pro.nix > pinebook-pro.nix; sudo mv -f pinebook-pro.nix /mnt/etc/nixos/

From 8da4b82c810a9f9efd539c3bcadd14a3b83d399e Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:21:25 +0000
Subject: [PATCH 21/24] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 449686c..7526b4b 100644
--- a/install.sh
+++ b/install.sh
@@ -79,7 +79,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""

From 74909e63e47ce4b2322a28700341d8f24dfb5564 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:29:27 +0000
Subject: [PATCH 22/24] Update install.sh

---
 install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/install.sh b/install.sh
index 7526b4b..8de8c49 100644
--- a/install.sh
+++ b/install.sh
@@ -63,9 +63,6 @@ sudo e2label $rootName NixOS
 sudo swapon $swapName
 sudo mount $rootName /mnt
 
-# Unmount root
-sudo umount /mnt
-
 # Mount the EFI partition.
 sudo mkdir /mnt/boot/
 sudo mount $efiName /mnt/boot

From 4f9cfac60728f3b3c300e1745899074ada22d941 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 17:52:47 +0000
Subject: [PATCH 23/24] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 8de8c49..14f8c90 100644
--- a/install.sh
+++ b/install.sh
@@ -76,7 +76,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main-pbp/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""

From 64aaa67037d59bac8d97f8b0826da39bc9428131 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 25 Jan 2023 18:09:29 +0000
Subject: [PATCH 24/24] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 14f8c90..8de8c49 100644
--- a/install.sh
+++ b/install.sh
@@ -76,7 +76,7 @@ sudo nixos-generate-config --root /mnt
 echo "Default username and password are in the configuration.nix file"
 echo "Password is hashed so it is not plaintext"
 
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main-pbp/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
 echo ""