From bdebc5b8f04ae357258176ebf106870c8120b155 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 28 Dec 2023 21:18:48 +0000
Subject: [PATCH 01/21] Update install.sh

---
 install.sh | 43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/install.sh b/install.sh
index 77b03d0..21029ab 100644
--- a/install.sh
+++ b/install.sh
@@ -45,44 +45,15 @@ rootName+=2
 swapName=${driveName}$APPEND
 swapName+=3
 
-# Create EFI partition
-sudo mkfs.fat -F32 -n EFI $efiName       
+# Download Disko file
+cd /tmp
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/luks-btrfs-subvolumes.nix -o /tmp/disko-config.nix
 
-# Encrypt the root partition
-sudo cryptsetup luksFormat -v -s 512 -h sha512 $rootName
+# Replace drive in Disko file
+sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
 
-# Open the encrypted root partition
-sudo cryptsetup luksOpen $rootName crypt-root
-
-sudo pvcreate /dev/mapper/crypt-root
-sudo vgcreate lvm /dev/mapper/crypt-root
-
-sudo lvcreate -L 4G -n swap lvm
-sudo lvcreate -l '100%FREE' -n root lvm
-
-sudo cryptsetup config $rootName --label luks
-
-sudo mkswap /dev/lvm/swap              # swap partition
-sudo mkfs.btrfs -L root /dev/mapper/lvm-root  # /root partition
-
-# Mount the filesystems.
-sudo swapon /dev/mapper/lvm-swap
-sudo mount /dev/mapper/lvm-root /mnt
-
-# Create Subvolumes
-sudo btrfs subvolume create /mnt/@root
-sudo btrfs subvolume create /mnt/@home
-
-# Unmount root
-sudo umount /mnt
-
-# Mount the subvolumes.
-sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@root /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 mount --mkdir $efiName /mnt/boot/
+# Run Disko to partition the disk
+sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix
 
 # Generate Nix configuration
 sudo nixos-generate-config --root /mnt

From 0ccf221ea095e8cc44fd3376992334ea05dc086c Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 15:24:02 +0000
Subject: [PATCH 02/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 21029ab..e659718 100644
--- a/install.sh
+++ b/install.sh
@@ -15,22 +15,6 @@ echo ""
 echo "Which drive do we want to use for this installation?"
 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.
-echo         # Set last sector.
-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
 

From 34ce1bdffb103ede062e014499b6cd08e4021dac Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 15:28:28 +0000
Subject: [PATCH 03/21] Update install.sh

---
 install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index e659718..1f7bf28 100644
--- a/install.sh
+++ b/install.sh
@@ -40,7 +40,10 @@ sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix
 
 # Generate Nix configuration
-sudo nixos-generate-config --root /mnt
+#sudo nixos-generate-config --root /mnt
+
+sudo nixos-generate-config --no-filesystems --root /mnt
+sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 
 # Copy my base nix configs over
 # Change the URL to match where you are hosting your .nix file(s).
@@ -48,8 +51,8 @@ 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/programs.nix > programs.nix; sudo mv -f programs.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 ""
 echo "Which device are you installing to?"

From 818737c53a65d0f796774370ed8123602a109fd7 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 15:33:25 +0000
Subject: [PATCH 04/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 1f7bf28..55b361c 100644
--- a/install.sh
+++ b/install.sh
@@ -31,10 +31,10 @@ swapName+=3
 
 # Download Disko file
 cd /tmp
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/luks-btrfs-subvolumes.nix -o /tmp/disko-config.nix
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/simple-efi.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
-sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
+#sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
 
 # Run Disko to partition the disk
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix

From c770791c8e8cf62d36a9d87cf5e1b5d12d7404d8 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 15:49:13 +0000
Subject: [PATCH 05/21] Update install.sh

---
 install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 55b361c..3d4146f 100644
--- a/install.sh
+++ b/install.sh
@@ -97,6 +97,10 @@ elif [ $deviceChoice = 6 ]; then
 
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+   sudo sed -i "11 i \           "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"" /mnt/etc/nixos/configuration.nix
+   sudo sed -i "12 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
+   
+   ./disko-config.nix
 fi
 
 echo ""
@@ -130,7 +134,7 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Replace LUKS device
-sudo sed -i "s#/dev/sda#$rootName#g" /mnt/etc/nixos/configuration.nix
+#sudo sed -i "s#/dev/sda#$rootName#g" /mnt/etc/nixos/configuration.nix
 
 # Install
 sudo nixos-install

From 6617b81c473ef133117ba893ebe2816fd068870f Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:10:50 +0000
Subject: [PATCH 06/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 3d4146f..9264ef0 100644
--- a/install.sh
+++ b/install.sh
@@ -97,7 +97,7 @@ elif [ $deviceChoice = 6 ]; then
 
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
-   sudo sed -i "11 i \           "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"" /mnt/etc/nixos/configuration.nix
+   sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
    sudo sed -i "12 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    
    ./disko-config.nix

From 2777ed06541340422463ca2f1e00748b358e3a76 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:11:29 +0000
Subject: [PATCH 07/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 9264ef0..5a79dc0 100644
--- a/install.sh
+++ b/install.sh
@@ -99,9 +99,7 @@ elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
    sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
    sudo sed -i "12 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
-   
-   ./disko-config.nix
-fi
+   fi
 
 echo ""
 echo "Which Desktop Environment do you want?"

From 3ed3d5d8696eb719c2fe43775016da9942501bc6 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:14:13 +0000
Subject: [PATCH 08/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 5a79dc0..5571d59 100644
--- a/install.sh
+++ b/install.sh
@@ -98,7 +98,7 @@ elif [ $deviceChoice = 6 ]; then
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
    sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
-   sudo sed -i "12 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
+   sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    fi
 
 echo ""

From 28293c042e39136a430f25c33cda4b7c69384101 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:15:58 +0000
Subject: [PATCH 09/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 5571d59..75d12ca 100644
--- a/install.sh
+++ b/install.sh
@@ -97,7 +97,7 @@ elif [ $deviceChoice = 6 ]; then
 
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
-   sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
+   sudo sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
    sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    fi
 

From a34e71876b34fbd0f0e0a9675d0b0e19eb8cdd27 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:24:52 +0000
Subject: [PATCH 10/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 75d12ca..93ba5f5 100644
--- a/install.sh
+++ b/install.sh
@@ -96,7 +96,7 @@ elif [ $deviceChoice = 6 ]; then
    sudo sed -i "11 i \           ./darp9.nix" /mnt/etc/nixos/configuration.nix
 
 elif [ $deviceChoice = 7 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
    sudo sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
    sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    fi

From 9311549eea098735466aae79f21f9cbf0ccbdd62 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:46:48 +0000
Subject: [PATCH 11/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 93ba5f5..010a425 100644
--- a/install.sh
+++ b/install.sh
@@ -54,16 +54,18 @@ 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/programs.nix > programs.nix; sudo mv -f programs.nix /mnt/etc/nixos/
 
-echo ""
-echo "Which device are you installing to?"
-echo "1) Home Desktop - Shepard"
-echo "2) Galago Pro (galp3-b) - Garrus"
-echo "3) HP Omen (15-dh0015nr)"
-echo "4) Pinebook Pro - Jaal"
-echo "5) Thelio NVIDIA (thelio-b1)"
-echo "6) Darter Pro (darp9)"
-echo "7) Virtual Machine"
-echo "0) None or N/A"
+cat << EOF
+
+Which device are you installing to?
+   1) Home Desktop - Shepard
+   2) Galago Pro (galp3-b) - Garrus
+   3) HP Omen (15-dh0015nr)
+   4) Pinebook Pro - Jaal
+   5) Thelio NVIDIA (thelio-b1)
+   6) Darter Pro (darp9)
+   7) Virtual Machine
+   0) None or N/A
+EOF
 read deviceChoice
 
 # Change the URL to match where you are hosting your system .nix file

From 5823acbed7d54b256d9ded5785bcd6b999dc4ced Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:50:25 +0000
Subject: [PATCH 12/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 010a425..3a3592b 100644
--- a/install.sh
+++ b/install.sh
@@ -2,9 +2,6 @@
 # then sets it as a variable for hibernation support
 ramTotal=$(free -h | awk '/^Mem:/{print $2}'| awk -FG {'print$1'})
 
-# Set append for drive automation
-APPEND=""
-
 # Detect and list the drives.
 lsblk -f
 
@@ -15,26 +12,12 @@ echo ""
 echo "Which drive do we want to use for this installation?"
 read driveName
 
-# List the new partitions.
-lsblk -f
-
-if [[ "$driveName" == "/dev/nvme"* || "$driveName" == "/dev/mmcblk0"* ]]; then
-  APPEND="p"
-fi
-
-efiName=${driveName}$APPEND
-efiName+=1
-rootName=${driveName}$APPEND
-rootName+=2
-swapName=${driveName}$APPEND
-swapName+=3
-
 # Download Disko file
 cd /tmp
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/simple-efi.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
-#sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
+sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
 
 # Run Disko to partition the disk
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix

From 045469eec08f217a7ec017bb0696e914d3836f5f Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:50:49 +0000
Subject: [PATCH 13/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 3a3592b..9849d0e 100644
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,7 @@ read driveName
 
 # Download Disko file
 cd /tmp
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/simple-efi.nix -o /tmp/disko-config.nix
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/simple-efi.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
 sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix

From 9192cd819c7e8d86d0b4a7a126980e2e4f62818d Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 16:51:19 +0000
Subject: [PATCH 14/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 9849d0e..e262e0c 100644
--- a/install.sh
+++ b/install.sh
@@ -17,7 +17,7 @@ cd /tmp
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/simple-efi.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
-sudo sed -i "s#/dev/vdb#$rootName#g" /tmp/disko-config.nix
+sudo sed -i "s#/dev/sda#$driveName#g" /tmp/disko-config.nix
 
 # Run Disko to partition the disk
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix

From 5efb2d8ee7453e062801dcc182570c312d4f7c51 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 17:01:33 +0000
Subject: [PATCH 15/21] Update both ECHO options to EOF instead

---
 install.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index e262e0c..5bc291b 100644
--- a/install.sh
+++ b/install.sh
@@ -86,13 +86,15 @@ elif [ $deviceChoice = 7 ]; then
    sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    fi
 
-echo ""
-echo "Which Desktop Environment do you want?"
-echo "1) Plasma"
-echo "2) GNOME"
-echo "3) Pantheon"
-echo "4) Sway"
-echo "0) None or N/A"
+cat << EOF
+
+Which Desktop Environment do you want?
+   1) Plasma
+   2) GNOME
+   3) Pantheon
+   4) Sway
+   0) None or N/A
+EOF
 read desktopChoice
 
 # Change the URL to match where you are hosting your DE/WM .nix file

From 451de45b43acb10276e4a691e458e940a14faa03 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 17:32:11 +0000
Subject: [PATCH 16/21] swap in LUKS BTRFS subvol file

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

diff --git a/install.sh b/install.sh
index 5bc291b..62c35a9 100644
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,8 @@ read driveName
 
 # Download Disko file
 cd /tmp
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/simple-efi.nix -o /tmp/disko-config.nix
+#curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/simple-efi.nix -o /tmp/disko-config.nix
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/luks-btrfs-subvolumes.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
 sudo sed -i "s#/dev/sda#$driveName#g" /tmp/disko-config.nix

From a41e7a78248ff01b075369c4dc4326e490638222 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 18:28:56 +0000
Subject: [PATCH 17/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 62c35a9..ff26344 100644
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,6 @@ read driveName
 
 # Download Disko file
 cd /tmp
-#curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/simple-efi.nix -o /tmp/disko-config.nix
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/luks-btrfs-subvolumes.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
@@ -24,8 +23,6 @@ sudo sed -i "s#/dev/sda#$driveName#g" /tmp/disko-config.nix
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix
 
 # Generate Nix configuration
-#sudo nixos-generate-config --root /mnt
-
 sudo nixos-generate-config --no-filesystems --root /mnt
 sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 

From ccc91857a306502e473bb3ff1e2e5443d7cb0744 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 20:05:56 +0000
Subject: [PATCH 18/21] Update thelio-b1 build

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

diff --git a/install.sh b/install.sh
index ff26344..8704bb8 100644
--- a/install.sh
+++ b/install.sh
@@ -32,7 +32,7 @@ sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 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/disko/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/
 
 cat << EOF
@@ -70,6 +70,8 @@ elif [ $deviceChoice = 4 ]; then
 
 elif [ $deviceChoice = 5 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/thelio-nvidia.nix > thelio-nvidia.nix; sudo mv -f thelio-nvidia.nix /mnt/etc/nixos/
+   sudo sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
+   sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    sudo sed -i "11 i \           ./thelio-nvidia.nix" /mnt/etc/nixos/configuration.nix 
    # Disable latest kernel for Thelio with NVIDIA GPU
    sudo sed -i "s/boot.kernelPackages/# boot.kernelPackages/g" /mnt/etc/nixos/configuration.nix

From a6297052a76fb4961071a122dc7e090ca91297a1 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 20:21:30 +0000
Subject: [PATCH 19/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index 8704bb8..ccc3453 100644
--- a/install.sh
+++ b/install.sh
@@ -82,8 +82,6 @@ elif [ $deviceChoice = 6 ]; then
 
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
-   sudo sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
-   sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    fi
 
 cat << EOF
@@ -118,8 +116,5 @@ elif [ $desktopChoice = 4 ]; then
 
 fi
 
-# Replace LUKS device
-#sudo sed -i "s#/dev/sda#$rootName#g" /mnt/etc/nixos/configuration.nix
-
 # Install
 sudo nixos-install

From 3643da70631f44c00c0500b24ff3395cb24a2cdd Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 29 Dec 2023 21:07:56 +0000
Subject: [PATCH 20/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index ccc3453..c535ddd 100644
--- a/install.sh
+++ b/install.sh
@@ -70,8 +70,6 @@ elif [ $deviceChoice = 4 ]; then
 
 elif [ $deviceChoice = 5 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/thelio-nvidia.nix > thelio-nvidia.nix; sudo mv -f thelio-nvidia.nix /mnt/etc/nixos/
-   sudo sed -i 's#disko#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"#'  /mnt/etc/nixos/configuration.nix
-   sudo sed -i "10 i \           ./disko-config.nix" /mnt/etc/nixos/configuration.nix
    sudo sed -i "11 i \           ./thelio-nvidia.nix" /mnt/etc/nixos/configuration.nix 
    # Disable latest kernel for Thelio with NVIDIA GPU
    sudo sed -i "s/boot.kernelPackages/# boot.kernelPackages/g" /mnt/etc/nixos/configuration.nix

From 97a2594eb9e0da9767bc4f8406f7758e680b7318 Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 2 Jan 2024 17:42:25 +0000
Subject: [PATCH 21/21] Update install.sh

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

diff --git a/install.sh b/install.sh
index c535ddd..be7ecbe 100644
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,7 @@ read driveName
 
 # Download Disko file
 cd /tmp
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/partitions/luks-btrfs-subvolumes.nix -o /tmp/disko-config.nix
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/luks-btrfs-subvolumes.nix -o /tmp/disko-config.nix
 
 # Replace drive in Disko file
 sudo sed -i "s#/dev/sda#$driveName#g" /tmp/disko-config.nix
@@ -32,7 +32,7 @@ sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 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/disko/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/
 
 cat << EOF
@@ -79,7 +79,7 @@ elif [ $deviceChoice = 6 ]; then
    sudo sed -i "11 i \           ./darp9.nix" /mnt/etc/nixos/configuration.nix
 
 elif [ $deviceChoice = 7 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/disko/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
    fi
 
 cat << EOF