From e05760dde35f90f8e4d6d7017475748db2f2d51a Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 14:59:17 +0000
Subject: [PATCH 01/34] Edit VM options to use flake file and use nixos-install
 flake option

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

diff --git a/install.sh b/install.sh
index be7ecbe..bd601bd 100644
--- a/install.sh
+++ b/install.sh
@@ -79,7 +79,8 @@ 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/main/systems/flake.nix > flake.nix; sudo mv -f flake.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
@@ -115,4 +116,5 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-sudo nixos-install
+sudo nixos-install --impure --flake /mnt/etc/nixos/flake.nix
+#sudo nixos-install

From a11e58c93bdef7b8c2461e9d2e19a436dbc55c92 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 16:42:17 +0000
Subject: [PATCH 02/34] Update install.sh

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

diff --git a/install.sh b/install.sh
index bd601bd..8005f68 100644
--- a/install.sh
+++ b/install.sh
@@ -116,5 +116,5 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-sudo nixos-install --impure --flake /mnt/etc/nixos/flake.nix
+sudo nixos-install --impure --flake /mnt/etc/nixos/flake.nix#vm
 #sudo nixos-install

From cd4523a6aa461a73439aecc33ce98477949ea35c Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 16:43:26 +0000
Subject: [PATCH 03/34] fix path

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

diff --git a/install.sh b/install.sh
index 8005f68..58a370a 100644
--- a/install.sh
+++ b/install.sh
@@ -116,5 +116,5 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-sudo nixos-install --impure --flake /mnt/etc/nixos/flake.nix#vm
+sudo nixos-install --impure --flake /mnt/etc/nixos#vm
 #sudo nixos-install

From be6f524998cc72fdef9b8d9cc5208b7ea7261d85 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 16:44:14 +0000
Subject: [PATCH 04/34] Fix flake path for VM

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

diff --git a/install.sh b/install.sh
index 58a370a..b378c30 100644
--- a/install.sh
+++ b/install.sh
@@ -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/main/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.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
 

From 1e37870e70b5be8e3876de9420d9f46ac7ab1b1a Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 16:48:10 +0000
Subject: [PATCH 05/34] Disable downloading the configuration.nix for now

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

diff --git a/install.sh b/install.sh
index b378c30..ac2aa3a 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/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

From ff818891e46105206ddcaafebbb4fa4b24b00db6 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 17:14:33 +0000
Subject: [PATCH 06/34] Add if/then

---
 install.sh | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index ac2aa3a..9351704 100644
--- a/install.sh
+++ b/install.sh
@@ -116,5 +116,26 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-sudo nixos-install --impure --flake /mnt/etc/nixos#vm
+if [ $deviceChoice = 1 ]; then
+   echo "shepard"
+
+elif [ $deviceChoice = 2 ]; then
+   echo "garrus"
+
+elif [ $deviceChoice = 3 ]; then
+   echo "hp-omen"
+
+elif [ $deviceChoice = 4 ]; then
+   echo "pbp" 
+
+elif [ $deviceChoice = 5 ]; then
+   echo "thelio-nvidia"
+
+elif [ $deviceChoice = 6 ]; then
+   echo "darp9"
+
+elif [ $deviceChoice = 7 ]; then
+   sudo nixos-install --impure --flake /mnt/etc/nixos#vm
+   fi
+
 #sudo nixos-install

From d947ea93b2971ed7395a4287734d652a4bc6b344 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 18:27:35 +0000
Subject: [PATCH 07/34] Test new nixos-install

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

diff --git a/install.sh b/install.sh
index 9351704..ed942bb 100644
--- a/install.sh
+++ b/install.sh
@@ -116,26 +116,5 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-if [ $deviceChoice = 1 ]; then
-   echo "shepard"
-
-elif [ $deviceChoice = 2 ]; then
-   echo "garrus"
-
-elif [ $deviceChoice = 3 ]; then
-   echo "hp-omen"
-
-elif [ $deviceChoice = 4 ]; then
-   echo "pbp" 
-
-elif [ $deviceChoice = 5 ]; then
-   echo "thelio-nvidia"
-
-elif [ $deviceChoice = 6 ]; then
-   echo "darp9"
-
-elif [ $deviceChoice = 7 ]; then
-   sudo nixos-install --impure --flake /mnt/etc/nixos#vm
-   fi
-
+sudo nixos-install --flake
 #sudo nixos-install

From 928af8b3d7a27398a42cd123f0392d871c05c5d3 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 8 Jan 2024 18:31:29 +0000
Subject: [PATCH 08/34] You do need to set the system name in the nixos-install
 command for it to work

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

diff --git a/install.sh b/install.sh
index ed942bb..6ef4bc3 100644
--- a/install.sh
+++ b/install.sh
@@ -116,5 +116,5 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-sudo nixos-install --flake
+sudo nixos-install --flake /mnt/etc/nixos#vm
 #sudo nixos-install

From 6390329d069603acc40e35effe06a384a47753f3 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 9 Jan 2024 14:35:17 +0000
Subject: [PATCH 09/34] Add generic flake option

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

diff --git a/install.sh b/install.sh
index 6ef4bc3..c4a8521 100644
--- a/install.sh
+++ b/install.sh
@@ -45,7 +45,7 @@ Which device are you installing to?
    5) Thelio NVIDIA (thelio-b1)
    6) Darter Pro (darp9)
    7) Virtual Machine
-   0) None or N/A
+   0) Generic
 EOF
 read deviceChoice
 
@@ -81,6 +81,10 @@ elif [ $deviceChoice = 6 ]; then
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.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/
+
+elif [ $deviceChoice = 7 ]; then
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+
    fi
 
 cat << EOF
@@ -116,5 +120,5 @@ elif [ $desktopChoice = 4 ]; then
 fi
 
 # Install
-sudo nixos-install --flake /mnt/etc/nixos#vm
+sudo nixos-install --flake /mnt/etc/nixos#nixos
 #sudo nixos-install

From 14b72a9dcd7fdaf4d2423af90bb74865af7c3e21 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 9 Jan 2024 14:35:42 +0000
Subject: [PATCH 10/34] Fix new option

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

diff --git a/install.sh b/install.sh
index c4a8521..9d3c860 100644
--- a/install.sh
+++ b/install.sh
@@ -82,7 +82,7 @@ elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.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/
 
-elif [ $deviceChoice = 7 ]; then
+elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
 
    fi

From 490a41279522926dc40fdf59d00a95cd8193bcd1 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 9 Jan 2024 19:49:47 +0000
Subject: [PATCH 11/34] Switch other systems to the generic flake and remove
 extra line at the end of the script

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

diff --git a/install.sh b/install.sh
index 9d3c860..c3ec5cd 100644
--- a/install.sh
+++ b/install.sh
@@ -53,15 +53,15 @@ read deviceChoice
 # Update the second command to the file name that matches your system .nix file
 
 if [ $deviceChoice = 1 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/shepard/configuration.nix > shepard.nix; sudo mv -f shepard.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    sudo sed -i "11 i \           ./shepard.nix" /mnt/etc/nixos/configuration.nix
 
 elif [ $deviceChoice = 2 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    sudo sed -i "11 i \           ./garrus.nix" /mnt/etc/nixos/configuration.nix
 
 elif [ $deviceChoice = 3 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/hp-omen.nix > hp-omen.nix; sudo mv -f hp-omen.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    sudo sed -i "11 i \           ./hp-omen.nix" /mnt/etc/nixos/configuration.nix 
 
 elif [ $deviceChoice = 4 ]; then
@@ -69,10 +69,8 @@ elif [ $deviceChoice = 4 ]; then
    sudo sed -i "11 i \           ./jaal.nix" /mnt/etc/nixos/configuration.nix 
 
 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/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    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
 
 elif [ $deviceChoice = 6 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/darp9.nix > darp9.nix; sudo mv -f darp9.nix /mnt/etc/nixos/

From 3ed0d05b054f29f4fde690e3eeb57047fb1a9123 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 9 Jan 2024 19:55:22 +0000
Subject: [PATCH 12/34] Revert change but swap configuration.nix to flake.nix

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

diff --git a/install.sh b/install.sh
index c3ec5cd..8ccf085 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/flake/flake.nix > flake.nix; sudo mv -f flake.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
@@ -53,15 +53,15 @@ read deviceChoice
 # Update the second command to the file name that matches your system .nix file
 
 if [ $deviceChoice = 1 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/shepard/configuration.nix > shepard.nix; sudo mv -f shepard.nix /mnt/etc/nixos
    sudo sed -i "11 i \           ./shepard.nix" /mnt/etc/nixos/configuration.nix
 
 elif [ $deviceChoice = 2 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos
    sudo sed -i "11 i \           ./garrus.nix" /mnt/etc/nixos/configuration.nix
 
 elif [ $deviceChoice = 3 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/hp-omen/configuration.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 
 
 elif [ $deviceChoice = 4 ]; then
@@ -69,7 +69,7 @@ elif [ $deviceChoice = 4 ]; then
    sudo sed -i "11 i \           ./jaal.nix" /mnt/etc/nixos/configuration.nix 
 
 elif [ $deviceChoice = 5 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   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 "11 i \           ./thelio-nvidia.nix" /mnt/etc/nixos/configuration.nix 
 
 elif [ $deviceChoice = 6 ]; then

From b5f977e403b36ddc25fa321c960ab8da69d8a091 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 9 Jan 2024 19:56:10 +0000
Subject: [PATCH 13/34] Update messaging

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

diff --git a/install.sh b/install.sh
index 8ccf085..d8e4538 100644
--- a/install.sh
+++ b/install.sh
@@ -8,7 +8,6 @@ lsblk -f
 # Choice the drive to use :
 # 1. 
 echo "----------"
-echo ""
 echo "Which drive do we want to use for this installation?"
 read driveName
 
@@ -29,8 +28,10 @@ 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).
 
-echo "Default username and password are in the configuration.nix file"
+echo ""
+echo "Default username and password are in the flake.nix file"
 echo "Password is hashed so it is not plaintext"
+echo ""
 
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.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/

From fb7de0dbe85cb7e9488b78425c8fef29f057a7a0 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 9 Jan 2024 20:02:19 +0000
Subject: [PATCH 14/34] Remove unneeded VM config.nix file

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

diff --git a/install.sh b/install.sh
index d8e4538..a80817f 100644
--- a/install.sh
+++ b/install.sh
@@ -79,7 +79,6 @@ elif [ $deviceChoice = 6 ]; then
 
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.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/
 
 elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/

From 1641a786f012983fb39905125b0dabf3221085d1 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 11 Jan 2024 18:56:30 +0000
Subject: [PATCH 15/34] Clean up comments in the code to make it more readable
 hopefully

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

diff --git a/install.sh b/install.sh
index a80817f..73d3d2a 100644
--- a/install.sh
+++ b/install.sh
@@ -5,8 +5,9 @@ ramTotal=$(free -h | awk '/^Mem:/{print $2}'| awk -FG {'print$1'})
 # Detect and list the drives.
 lsblk -f
 
+# Step 1: Choosing the drive for the installation
+
 # Choice the drive to use :
-# 1. 
 echo "----------"
 echo "Which drive do we want to use for this installation?"
 read driveName
@@ -18,6 +19,8 @@ curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/partitions/luks-btrfs-s
 # Replace drive in Disko file
 sudo sed -i "s#/dev/sda#$driveName#g" /tmp/disko-config.nix
 
+# Step 2: Partitioning the drive used for the installation
+
 # Run Disko to partition the disk
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko /tmp/disko-config.nix
 
@@ -25,16 +28,10 @@ sudo nix --experimental-features "nix-command flakes" run github:nix-community/d
 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).
-
-echo ""
-echo "Default username and password are in the flake.nix file"
-echo "Password is hashed so it is not plaintext"
-echo ""
-
+# Downloads and places the predefinded generic flake to use
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.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/
+
+# Step 3: Choosing a predefined system flake file to use
 
 cat << EOF
 
@@ -50,9 +47,6 @@ Which device are you installing to?
 EOF
 read deviceChoice
 
-# Change the URL to match where you are hosting your system .nix file
-# Update the second command to the file name that matches your system .nix file
-
 if [ $deviceChoice = 1 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/shepard/configuration.nix > shepard.nix; sudo mv -f shepard.nix /mnt/etc/nixos
    sudo sed -i "11 i \           ./shepard.nix" /mnt/etc/nixos/configuration.nix
@@ -85,6 +79,8 @@ elif [ $deviceChoice = 0 ]; then
 
    fi
 
+# Step 4: Choosing a predefined desktop/window manager file to use
+
 cat << EOF
 
 Which Desktop Environment do you want?
@@ -96,9 +92,6 @@ Which Desktop Environment do you want?
 EOF
 read desktopChoice
 
-# Change the URL to match where you are hosting your DE/WM .nix file
-# Update the second command to the file name that matches your DE/WM .nix file
-
 if [ $desktopChoice = 1 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/plasma.nix > plasma.nix; sudo mv -f plasma.nix /mnt/etc/nixos/
    sudo sed -i "10 i \           ./plasma.nix" /mnt/etc/nixos/configuration.nix

From 8d26d86a5d7a6f7bb1c6534c6339262eb54bc111 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 16 Jan 2024 16:23:22 +0000
Subject: [PATCH 16/34] Download home-manager file

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

diff --git a/install.sh b/install.sh
index 73d3d2a..5e9e993 100644
--- a/install.sh
+++ b/install.sh
@@ -30,6 +30,7 @@ sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 
 # Downloads and places the predefinded generic flake to use
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/home.nix > home.nix; sudo mv -f home.nix /mnt/etc/nixos/
 
 # Step 3: Choosing a predefined system flake file to use
 

From 8063942f61ebd625d1a30871843ddf3419d457c5 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 16 Jan 2024 17:35:02 +0000
Subject: [PATCH 17/34] Add Dev One, remove desktops for now.

---
 install.sh | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/install.sh b/install.sh
index 5e9e993..7d04c91 100644
--- a/install.sh
+++ b/install.sh
@@ -44,6 +44,7 @@ Which device are you installing to?
    5) Thelio NVIDIA (thelio-b1)
    6) Darter Pro (darp9)
    7) Virtual Machine
+   8) HP Dev One
    0) Generic
 EOF
 read deviceChoice
@@ -75,42 +76,11 @@ elif [ $deviceChoice = 6 ]; then
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
 
+elif [ $deviceChoice = 8 ]; then
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   sudo nixos-install --flake /mnt/etc/nixos#dev-one
+
 elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
 
    fi
-
-# Step 4: Choosing a predefined desktop/window manager file to use
-
-cat << EOF
-
-Which Desktop Environment do you want?
-   1) Plasma
-   2) GNOME
-   3) Pantheon
-   4) Sway
-   0) None or N/A
-EOF
-read desktopChoice
-
-if [ $desktopChoice = 1 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/plasma.nix > plasma.nix; sudo mv -f plasma.nix /mnt/etc/nixos/
-   sudo sed -i "10 i \           ./plasma.nix" /mnt/etc/nixos/configuration.nix
-
-elif [ $desktopChoice = 2 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
-   sudo sed -i "10 i \           ./gnome.nix" /mnt/etc/nixos/configuration.nix
-
-elif [ $desktopChoice = 3 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/pantheon.nix > pantheon.nix; sudo mv -f pantheon.nix /mnt/etc/nixos/
-   sudo sed -i "10 i \           ./pantheon.nix" /mnt/etc/nixos/configuration.nix
-
-elif [ $desktopChoice = 4 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/sway.nix > sway.nix; sudo mv -f sway.nix /mnt/etc/nixos/
-   sudo sed -i "10 i \           ./sway.nix" /mnt/etc/nixos/configuration.nix
-
-fi
-
-# Install
-sudo nixos-install --flake /mnt/etc/nixos#nixos
-#sudo nixos-install

From 553650b883fe0f2b3d8cd21db27f280cd1dc074b Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 16 Jan 2024 17:39:34 +0000
Subject: [PATCH 18/34] Update paths for dev-one and nixos generic

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

diff --git a/install.sh b/install.sh
index 7d04c91..bba7011 100644
--- a/install.sh
+++ b/install.sh
@@ -75,9 +75,11 @@ elif [ $deviceChoice = 6 ]; then
 
 elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   sudo nixos-install --flake /mnt/etc/nixos#nixos
 
 elif [ $deviceChoice = 8 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#dev-one
 
 elif [ $deviceChoice = 0 ]; then

From 9ff54a086411af1058a851ff42ed9a5c1576940a Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 16 Jan 2024 17:47:02 +0000
Subject: [PATCH 19/34] Update install.sh

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

diff --git a/install.sh b/install.sh
index bba7011..09c566a 100644
--- a/install.sh
+++ b/install.sh
@@ -74,11 +74,11 @@ 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/flake/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#nixos
 
 elif [ $deviceChoice = 8 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#dev-one
 

From 1d5a54e841400fcbcfc7c557da0a64d09fbc6d88 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 16 Jan 2024 18:03:15 +0000
Subject: [PATCH 20/34] remove other devices for now.

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

diff --git a/install.sh b/install.sh
index 09c566a..8a97160 100644
--- a/install.sh
+++ b/install.sh
@@ -37,47 +37,18 @@ curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/home.nix > home.nix; s
 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
-   8) HP Dev One
+   1) Virtual Machine
+   2) HP Dev One
    0) Generic
 EOF
 read deviceChoice
 
 if [ $deviceChoice = 1 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/shepard/configuration.nix > shepard.nix; sudo mv -f shepard.nix /mnt/etc/nixos
-   sudo sed -i "11 i \           ./shepard.nix" /mnt/etc/nixos/configuration.nix
-
-elif [ $deviceChoice = 2 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos
-   sudo sed -i "11 i \           ./garrus.nix" /mnt/etc/nixos/configuration.nix
-
-elif [ $deviceChoice = 3 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/hp-omen/configuration.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 
-
-elif [ $deviceChoice = 4 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/aarch64/jaal/pbp.nix > jaal.nix; sudo mv -f jaal.nix /mnt/etc/nixos/
-   sudo sed -i "11 i \           ./jaal.nix" /mnt/etc/nixos/configuration.nix 
-
-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 "11 i \           ./thelio-nvidia.nix" /mnt/etc/nixos/configuration.nix 
-
-elif [ $deviceChoice = 6 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/darp9.nix > darp9.nix; sudo mv -f darp9.nix /mnt/etc/nixos/
-   sudo sed -i "11 i \           ./darp9.nix" /mnt/etc/nixos/configuration.nix
-
-elif [ $deviceChoice = 7 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#nixos
 
-elif [ $deviceChoice = 8 ]; then
+elif [ $deviceChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#dev-one

From 5cacafbea4d4fb1d5478b065f9d72a0786cf0fe6 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 16 Jan 2024 19:53:00 +0000
Subject: [PATCH 21/34] Update VM setup

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

diff --git a/install.sh b/install.sh
index 8a97160..ede6e2f 100644
--- a/install.sh
+++ b/install.sh
@@ -45,8 +45,8 @@ read deviceChoice
 
 if [ $deviceChoice = 1 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
-   sudo nixos-install --flake /mnt/etc/nixos#nixos
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > vm.nix; sudo mv -f vm.nix /mnt/etc/nixos/
+   sudo nixos-install --flake /mnt/etc/nixos#vm
 
 elif [ $deviceChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/

From 054635f1fcc69d28726075003cd8e81d46a1e763 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 17 Jan 2024 13:17:08 +0000
Subject: [PATCH 22/34] Update install.sh

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

diff --git a/install.sh b/install.sh
index ede6e2f..12fff6a 100644
--- a/install.sh
+++ b/install.sh
@@ -30,6 +30,7 @@ sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 
 # Downloads and places the predefinded generic flake to use
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/home.nix > home.nix; sudo mv -f home.nix /mnt/etc/nixos/
 
 # Step 3: Choosing a predefined system flake file to use

From b637d3bfe2d1f15eb43485e2260e94aceefdfb36 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 13:58:07 +0000
Subject: [PATCH 23/34] Update install.sh

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

diff --git a/install.sh b/install.sh
index 12fff6a..32a2e7d 100644
--- a/install.sh
+++ b/install.sh
@@ -28,6 +28,9 @@ sudo nix --experimental-features "nix-command flakes" run github:nix-community/d
 sudo nixos-generate-config --no-filesystems --root /mnt
 sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 
+# Removes generated configuration file as it's being replaced with our own 
+sudo rm /mnt/etc/nixos/configuration.nix
+
 # Downloads and places the predefinded generic flake to use
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/

From 7a6c1f5104e915c51c38ddfd11ce4df817ac117d Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 14:02:57 +0000
Subject: [PATCH 24/34] Remove custom VM line

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

diff --git a/install.sh b/install.sh
index 32a2e7d..cf37b95 100644
--- a/install.sh
+++ b/install.sh
@@ -49,7 +49,6 @@ read deviceChoice
 
 if [ $deviceChoice = 1 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > vm.nix; sudo mv -f vm.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#vm
 
 elif [ $deviceChoice = 2 ]; then

From 82791c73b16276f96d551ab4db5d63ae349f1e05 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 14:20:22 +0000
Subject: [PATCH 25/34] Import vm configuration file

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

diff --git a/install.sh b/install.sh
index cf37b95..8a74ce3 100644
--- a/install.sh
+++ b/install.sh
@@ -28,9 +28,6 @@ sudo nix --experimental-features "nix-command flakes" run github:nix-community/d
 sudo nixos-generate-config --no-filesystems --root /mnt
 sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 
-# Removes generated configuration file as it's being replaced with our own 
-sudo rm /mnt/etc/nixos/configuration.nix
-
 # Downloads and places the predefinded generic flake to use
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
 curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
@@ -49,6 +46,7 @@ read deviceChoice
 
 if [ $deviceChoice = 1 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#vm
 
 elif [ $deviceChoice = 2 ]; then

From 6fe8c907b251964bdc4ce468520dafa6c906eaa9 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 14:23:43 +0000
Subject: [PATCH 26/34] Add example of drive path

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

diff --git a/install.sh b/install.sh
index 8a74ce3..20c8475 100644
--- a/install.sh
+++ b/install.sh
@@ -10,6 +10,7 @@ lsblk -f
 # Choice the drive to use :
 echo "----------"
 echo "Which drive do we want to use for this installation?"
+echo "For example /dev/sda or /dev/nvme0n1"
 read driveName
 
 # Download Disko file

From 09a5f2418544ac949ec4eff0b883dcfc76bc3b6e Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 14:24:26 +0000
Subject: [PATCH 27/34] Move fi over to make the code look cleaner

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

diff --git a/install.sh b/install.sh
index 20c8475..1f9d314 100644
--- a/install.sh
+++ b/install.sh
@@ -58,4 +58,4 @@ elif [ $deviceChoice = 2 ]; then
 elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
 
-   fi
+fi

From d355c4ec3eda299db7947c75e49978bc24c84c28 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 15:46:32 +0000
Subject: [PATCH 28/34] Add generic option from the flake

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

diff --git a/install.sh b/install.sh
index 1f9d314..424737f 100644
--- a/install.sh
+++ b/install.sh
@@ -57,5 +57,6 @@ elif [ $deviceChoice = 2 ]; then
 
 elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
+   sudo nixos-install --flake /mnt/etc/nixos#nixos
 
 fi

From c3ae7e37dd618ed0e53f213b7f12dd76686cdb54 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 18 Jan 2024 16:51:13 +0000
Subject: [PATCH 29/34] Update install.sh

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

diff --git a/install.sh b/install.sh
index 424737f..8c08fe8 100644
--- a/install.sh
+++ b/install.sh
@@ -46,12 +46,10 @@ EOF
 read deviceChoice
 
 if [ $deviceChoice = 1 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/vm.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/vm.nix > vm.nix; sudo mv -f vm.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#vm
 
 elif [ $deviceChoice = 2 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#dev-one
 

From a58e322a5b3517d35f1e3ee15cb04cc1af036b33 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 19 Jan 2024 13:38:59 +0000
Subject: [PATCH 30/34] Add thelio-b1

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

diff --git a/install.sh b/install.sh
index 8c08fe8..cc50d89 100644
--- a/install.sh
+++ b/install.sh
@@ -53,6 +53,10 @@ elif [ $deviceChoice = 2 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#dev-one
 
+elif [ $deviceChoice = 3 ]; then
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/thelio-nvidia.nix > thelio-nvidia.nix; sudo mv -f thelio-nvidia.nix /mnt/etc/nixos/
+   sudo nixos-install --flake /mnt/etc/nixos#thelio-b1
+
 elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#nixos

From 4933f6d0e6c1ac2d9a19f7fbcae7603b51873638 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 23 Jan 2024 20:06:48 +0000
Subject: [PATCH 31/34] Add thelio-b1

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

diff --git a/install.sh b/install.sh
index cc50d89..bfe0b00 100644
--- a/install.sh
+++ b/install.sh
@@ -41,6 +41,7 @@ cat << EOF
 Which device are you installing to?
    1) Virtual Machine
    2) HP Dev One
+   3) Thelio B1 (NVIDIA)
    0) Generic
 EOF
 read deviceChoice

From 999acc5296a5c07e4fc81ae8fbea2f9ff8333ed3 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 25 Jan 2024 22:54:51 +0000
Subject: [PATCH 32/34] Add galp3b

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

diff --git a/install.sh b/install.sh
index bfe0b00..c3f4745 100644
--- a/install.sh
+++ b/install.sh
@@ -42,6 +42,7 @@ Which device are you installing to?
    1) Virtual Machine
    2) HP Dev One
    3) Thelio B1 (NVIDIA)
+   4) Galago Pro 3b (Garrus)
    0) Generic
 EOF
 read deviceChoice
@@ -58,6 +59,10 @@ elif [ $deviceChoice = 3 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/thelio-nvidia.nix > thelio-nvidia.nix; sudo mv -f thelio-nvidia.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#thelio-b1
 
+elif [ $deviceChoice = 4 ]; then
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos/
+   sudo nixos-install --flake /mnt/etc/nixos#garrus
+
 elif [ $deviceChoice = 0 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#nixos

From dc1aa54f75a3949631c5834dc054628a92e941b1 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Thu, 25 Jan 2024 23:59:37 +0000
Subject: [PATCH 33/34] GNOME download for Thelio B1 and Galago 3B

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

diff --git a/install.sh b/install.sh
index c3f4745..802859e 100644
--- a/install.sh
+++ b/install.sh
@@ -57,10 +57,12 @@ elif [ $deviceChoice = 2 ]; then
 
 elif [ $deviceChoice = 3 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/thelio-nvidia.nix > thelio-nvidia.nix; sudo mv -f thelio-nvidia.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#thelio-b1
 
 elif [ $deviceChoice = 4 ]; then
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#garrus
 
 elif [ $deviceChoice = 0 ]; then

From 50744893ffd4027ad1a8989cd390ad926614b6ca Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 30 Jan 2024 17:42:06 +0000
Subject: [PATCH 34/34] Change from flake to main branch now that nix-configs
 change has been merged.

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

diff --git a/install.sh b/install.sh
index 802859e..35804a3 100644
--- a/install.sh
+++ b/install.sh
@@ -30,9 +30,9 @@ sudo nixos-generate-config --no-filesystems --root /mnt
 sudo mv /tmp/disko-config.nix /mnt/etc/nixos
 
 # Downloads and places the predefinded generic flake to use
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/flake.nix > flake.nix; sudo mv -f flake.nix /mnt/etc/nixos/
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/
-curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/home.nix > home.nix; sudo mv -f home.nix /mnt/etc/nixos/
+curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/flake.nix > flake.nix; sudo mv -f flake.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/home.nix > home.nix; sudo mv -f home.nix /mnt/etc/nixos/
 
 # Step 3: Choosing a predefined system flake file to use
 
@@ -48,7 +48,7 @@ EOF
 read deviceChoice
 
 if [ $deviceChoice = 1 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/vm.nix > vm.nix; sudo mv -f vm.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/vm.nix > vm.nix; sudo mv -f vm.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#vm
 
 elif [ $deviceChoice = 2 ]; then
@@ -56,12 +56,12 @@ elif [ $deviceChoice = 2 ]; then
    sudo nixos-install --flake /mnt/etc/nixos#dev-one
 
 elif [ $deviceChoice = 3 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/thelio-nvidia.nix > thelio-nvidia.nix; sudo mv -f thelio-nvidia.nix /mnt/etc/nixos/
+   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/
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#thelio-b1
 
 elif [ $deviceChoice = 4 ]; then
-   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/flake/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos/
+   curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/systems/x86_64/garrus/configuration.nix > garrus.nix; sudo mv -f garrus.nix /mnt/etc/nixos/
    curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
    sudo nixos-install --flake /mnt/etc/nixos#garrus