greg/nixos
1
0
Fork 2
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Move to Thelio boot

Browse Source
This commit is contained in:
Greg Hellings
2023-12-11 12:25:35 -06:00
parent c92cb922c8
commit 134a2dd2be
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/xonsh.nix
+1 -1
View File
@@ -46,7 +46,7 @@
gazelle = "compass workspace exec bazel run :gazelle"; gazelle = "compass workspace exec bazel run :gazelle";
cfetch = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache:fetch"; 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"; d = "vox deactivate";
devroles = "cd ~/src/ansible_collections/devroles"; devroles = "cd ~/src/ansible_collections/devroles";
dirflake = "nix flake new -t github:nix-community/nix-direnv"; dirflake = "nix flake new -t github:nix-community/nix-direnv";
hosts/jude/boot.nix
+15 -18
View File
@@ -1,37 +1,34 @@
{ lib, ... }: { lib, pkgs, ... }:
{ {
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot = { boot = {
supportedFilesystems = [ "ntfs" ]; supportedFilesystems = [ "ntfs" ];
loader = { loader = {
timeout = 15;
systemd-boot = { systemd-boot = {
enable = true; enable = true;
configurationLimit = 10; configurationLimit = 20;
extraEntries = { extraEntries = {
"Windows.conf" = (lib.strings.concatStringsSep "\n" [ "Windows.conf" = (lib.strings.concatStringsSep "\n" [
"title Windows" "title Windows"
"efi /EFI/Microsoft/EFI/bootmgfw.efi" "efi /EFI/Microsoft/EFI/bootmgfw.efi"
]); ]);
"Pop.conf" = (lib.strings.concatStringsSep "\n" [ "Win2.conf" = (lib.strings.concatStringsSep "\n" [
"title Pop!_OS" "title Windows 11"
"linux /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/vmlinuz.efi" "efi /shellx64.efi"
"initrd /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/initrd.img" "options -nointerrupt -noconsolein -noconsoleout windows11.nsh"
"options root=UUID=e4918d10-538d-42ad-b35d-a1ee2ed2a433 ro quiet loglevel=0 systemd.show_status=false splash"
]); ]);
"Pop-oldkern.conf" = (lib.strings.concatStringsSep "\n" [ "Shell.conf" = (lib.strings.concatStringsSep "\n" [
"title Pop!_OS" "title EFI Shell"
"linux /EFI/Pop_OS-e4918d10-538d-42ad-b35d-a1ee2ed2a433/vmlinuz-previous.efi" "efi /shell.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 "
]); ]);
}; };
extraFiles = {
"windows11.nsh" = (pkgs.writeText "windows11.nsh" (lib.strings.concatStringsSep "\n" [
]));
"shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
};
}; };
grub = { grub = {
enable = false; enable = false;
hosts/jude/default.nix
+4
View File
@@ -61,6 +61,10 @@
device = "/dev/nvme0n1p5"; device = "/dev/nvme0n1p5";
fsType = "ntfs-3g"; fsType = "ntfs-3g";
}; };
"/windows11" = {
device = "/dev/nvme1n1p2";
fsType = "ntfs-3g";
};
}; };
# Let's do a sound thing # Let's do a sound thing