hosts: consolidate pkgs.bootpart-uefi-x86_64 into hal/x86_64

This commit is contained in:
2025-06-22 06:53:55 +00:00
parent 8ace840d50
commit 2e40a2cf0c
6 changed files with 7 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
./fs.nix ./fs.nix
@@ -46,8 +46,6 @@
sane.programs.mpv.config.defaultProfile = "high-quality"; sane.programs.mpv.config.defaultProfile = "high-quality";
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
# needed to use libimobiledevice/ifuse, for iphone sync # needed to use libimobiledevice/ifuse, for iphone sync
services.usbmuxd.enable = true; services.usbmuxd.enable = true;

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
./fs.nix ./fs.nix
@@ -11,7 +11,6 @@
# sane.ovpn.addrV4 = "172.23.119.72"; # sane.ovpn.addrV4 = "172.23.119.72";
# sane.guest.enable = true; # sane.guest.enable = true;
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
sane.programs.sane-private-unlock-remote.enableFor.user.colin = true; sane.programs.sane-private-unlock-remote.enableFor.user.colin = true;
sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ]; sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ];

View File

@@ -1,4 +1,4 @@
{ lib, pkgs, ... }: { lib, ... }:
{ {
imports = [ imports = [
./fs.nix ./fs.nix
@@ -11,7 +11,6 @@
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:0332:aa96/128"; # sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:0332:aa96/128";
# sane.guest.enable = true; # sane.guest.enable = true;
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
sane.programs.sane-private-unlock-remote.enableFor.user.colin = true; sane.programs.sane-private-unlock-remote.enableFor.user.colin = true;
sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ]; sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ];

View File

@@ -1,10 +1,9 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
./fs.nix ./fs.nix
]; ];
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
sane.persist.enable = false; # what we mean here is that the image is immutable; `/` is still tmpfs. sane.persist.enable = false; # what we mean here is that the image is immutable; `/` is still tmpfs.
sane.nixcache.enable = false; # don't want to be calling out to dead machines that we're *trying* to rescue sane.nixcache.enable = false; # don't want to be calling out to dead machines that we're *trying* to rescue

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
@@ -31,8 +31,6 @@
# XXX(2024-07-27): this is incompatible if using s6, which needs to auto-login as `colin` to start its user services. # XXX(2024-07-27): this is incompatible if using s6, which needs to auto-login as `colin` to start its user services.
services.getty.autologinUser = "root"; services.getty.autologinUser = "root";
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
# both transmission and ipfs try to set different net defaults. # both transmission and ipfs try to set different net defaults.
# we just use the most aggressive of the two here: # we just use the most aggressive of the two here:
boot.kernel.sysctl = { boot.kernel.sysctl = {

View File

@@ -29,5 +29,7 @@ in
hardware.cpu.amd.updateMicrocode = true; # desktop hardware.cpu.amd.updateMicrocode = true; # desktop
hardware.cpu.intel.updateMicrocode = true; # laptop hardware.cpu.intel.updateMicrocode = true; # laptop
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
}; };
} }