diff --git a/home/xonsh.nix b/home/xonsh.nix
index 85e0148..3d03530 100644
--- a/home/xonsh.nix
+++ b/home/xonsh.nix
@@ -40,7 +40,7 @@
 			ctest = "compass workspace test";
 			cylint = "./scripts/run_yaml_lint.py";
 
-			cleanup = "nix-collect-garbage -d && nix store optimise";
+			cleanup = "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 6ab0cc9..ff5b492 100644
--- a/hosts/jude/boot.nix
+++ b/hosts/jude/boot.nix
@@ -1,17 +1,27 @@
 { ... }:
 
 {
+	#fileSystems."/boot/efi" = {
+	#	device = "/dev/by-uuid/9466C36266C34428";
+	#	fsType = "auto";
+	#};
 	# Use the systemd-boot EFI boot loader.
 	#boot.loader.systemd-boot.enable = true;
-	boot.loader.grub.device = "/dev/nvme0n1";
-	boot.loader.grub.useOSProber = false;
-	boot.loader.grub.extraEntries = ''
-		menuentry "Windows" --class windows --class os {
-		  insmod nfts
-		  search --no-floppy --set=root --fs-uuid A41B-5963
-		  chainloader (''${root})/EFI/Microsoft/Boot/bootmgfw.efi
-		}
-	'';
-	boot.loader.efi.canTouchEfiVariables = true;
+	boot = {
+		supportedFilesystems = [ "ntfs" ];
+		loader = {
+			grub = {
+				device = "/dev/nvme0n1";
+				useOSProber = true;
+				extraEntries = ''
+				menuentry "Windows" --class windows --class os {
+		  	  	  insmod ntfs
+		  	  	  chainloader (hd0,2)/Windows/Boot/EFI/bootmgfw.efi
+				}
+				'';
+			};
+			efi.canTouchEfiVariables = true;
+		};
+	};
 	networking.interfaces.enp4s0.useDHCP = true;
 }