From 134a2dd2bea4b25ecf90a65f65047f263bc5f712 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 11 Dec 2023 12:25:35 -0600
Subject: [PATCH] Move to Thelio boot

---
 home/xonsh.nix         |  2 +-
 hosts/jude/boot.nix    | 33 +++++++++++++++------------------
 hosts/jude/default.nix |  4 ++++
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/home/xonsh.nix b/home/xonsh.nix
index 90e0fea..e79cf20 100644
--- a/home/xonsh.nix
+++ b/home/xonsh.nix
@@ -46,7 +46,7 @@
 			gazelle = "compass workspace exec bazel run :gazelle";
 			cfetch = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache:fetch";
 
-			cleanup = "nix-collect-garbage --delete-older-than 30d && nix store optimise";
+			cleanup = "sudo nix-collect-garbage --delete-older-than 30d && nix store optimise";
 			d = "vox deactivate";
 			devroles = "cd ~/src/ansible_collections/devroles";
 			dirflake = "nix flake new -t github:nix-community/nix-direnv";
diff --git a/hosts/jude/boot.nix b/hosts/jude/boot.nix
index ba571c5..7e3df80 100644
--- a/hosts/jude/boot.nix
+++ b/hosts/jude/boot.nix
@@ -1,37 +1,34 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 {
 	# Use the systemd-boot EFI boot loader.
 	boot = {
 		supportedFilesystems = [ "ntfs" ];
 		loader = {
+			timeout = 15;
 			systemd-boot = {
 				enable = true;
-				configurationLimit = 10;
+				configurationLimit = 20;
 				extraEntries = {
 					"Windows.conf" = (lib.strings.concatStringsSep "\n" [
 						"title Windows"
 						"efi /EFI/Microsoft/EFI/bootmgfw.efi"
 					]);
-					"Pop.conf" = (lib.strings.concatStringsSep "\n" [
-						"title Pop!_OS"
-						"linux /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/vmlinuz.efi"
-						"initrd /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/initrd.img"
-						"options root=UUID=e4918d10-538d-42ad-b35d-a1ee2ed2a433 ro quiet loglevel=0 systemd.show_status=false splash"
+					"Win2.conf" = (lib.strings.concatStringsSep "\n" [
+						"title Windows 11"
+						"efi /shellx64.efi"
+						"options -nointerrupt -noconsolein -noconsoleout windows11.nsh"
 					]);
-					"Pop-oldkern.conf" = (lib.strings.concatStringsSep "\n" [
-						"title Pop!_OS"
-						"linux /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/vmlinuz-previous.efi"
-						"initrd /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/initrd.img-previous"
-						"options root=UUID=e4918d10-538d-42ad-b35d-a1ee2ed2a433 ro quiet loglevel=0 systemd.show_status=false splash"
-					]);
-					"Pop-recovery.conf" = (lib.strings.concatStringsSep "\n" [
-						"title Pop!_OS Recovery"
-						"linux /EFI/Recovery-1E97-BC0F/vmlinuz.efi"
-						"initrd /EFI/Recovery-1E97-BC0F/initrd.gz"
-						"options boot=casper hostname=recovery userfullname=Recovery username=recovery live-media-path=/casper-1E97-BC0F noprompt "
+					"Shell.conf" = (lib.strings.concatStringsSep "\n" [
+						"title EFI Shell"
+						"efi /shell.efi"
 					]);
 				};
+				extraFiles = {
+					"windows11.nsh" = (pkgs.writeText "windows11.nsh" (lib.strings.concatStringsSep "\n" [
+					]));
+					"shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
+				};
 			};
 			grub = {
 				enable = false;
diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix
index fe8922b..010351e 100644
--- a/hosts/jude/default.nix
+++ b/hosts/jude/default.nix
@@ -61,6 +61,10 @@
 			device = "/dev/nvme0n1p5";
 			fsType = "ntfs-3g";
 		};
+		"/windows11" = {
+			device = "/dev/nvme1n1p2";
+			fsType = "ntfs-3g";
+		};
 	};
 
 	# Let's do a sound thing