From b445b56e8eebbdf203227646e1f4c5787981777f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 18 Jan 2025 00:38:41 -0600
Subject: [PATCH] Prep for multi-boot partition

---
 disko/default.nix         |  8 ++++++--
 modules/nixos/default.nix |  1 +
 nixos/foxtrot.nix         | 10 +++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/disko/default.nix b/disko/default.nix
index fd1b39b..8feafe4 100644
--- a/disko/default.nix
+++ b/disko/default.nix
@@ -29,6 +29,8 @@ in rec {
       size = "4G";
       name = "ESP";
     },
+    rootfsName ? "/rootfs",
+    homeName ? "/home",
     disk,
     swapSize,
     ...
@@ -71,11 +73,11 @@ in rec {
                     type = "btrfs";
                     extraArgs = ["-f"];
                     subvolumes = {
-                      "/rootfs" = {
+                      ${rootfsName} = {
                         mountpoint = "/";
                         mountOptions = ["compress=zstd"];
                       };
-                      "/home" = {
+                      ${homeName} = {
                         mountpoint = "/home";
                         mountOptions = ["compress=zstd"];
                       };
@@ -97,6 +99,8 @@ in rec {
   foxtrot = standardWithHibernateSwap {
     disk = "nvme0n1";
     swapSize = "32G";
+    rootfsName = "/nixos-rootfs";
+    homeName = "/nixos-home";
     esp = {
       label = "disk-primary-ESP";
       name = "disk-primary-ESP";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 624fca2..01a22bd 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -250,6 +250,7 @@
         MANPAGER = "bat --style=plain";
       };
       systemPackages = with pkgs; [
+        aria2
         curl
         dua
         bat
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 9a5291b..0d06cb7 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -176,7 +176,15 @@
 
     loader = {
       efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
+      systemd-boot = {
+        enable = true;
+        extraEntries = {
+          "arch.conf" = ''
+            title Arch
+            efi   /efi/Arch/grubx64.efi
+          '';
+        };
+      };
     };
 
     # NOTE(oninstall):