about summary refs log tree commit diff
path: root/hosts/carmel
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-02-18 09:29:26 -0800
committerFranck Cuny <franck@fcuny.net>2022-02-18 09:30:39 -0800
commit5d3db43c0dec2971976c707415552715d9d16388 (patch)
tree4ae66abb9856356c5a6f45977f9ef2d48f7c4a7e /hosts/carmel
parentfonts: add more fonts for the system (diff)
downloadworld-5d3db43c0dec2971976c707415552715d9d16388.tar.gz
boot: reorganize and add comments
Most of the options for booting are common to all hosts.
Diffstat (limited to 'hosts/carmel')
-rw-r--r--hosts/carmel/default.nix19
1 files changed, 8 insertions, 11 deletions
diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix
index 0856337..0234e90 100644
--- a/hosts/carmel/default.nix
+++ b/hosts/carmel/default.nix
@@ -9,19 +9,16 @@
       ../common/system/boot-ssh.nix
     ];
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.initrd = {
-    luks.devices."system".allowDiscards = true;
-    kernelModules = [ "igb" ];
+  boot = {
+    # get an IP address on boot, so we can unlock the root disk remotely
+    kernelParams = [ "ip=dhcp" ];
+    initrd = {
+      luks.devices."system".allowDiscards = true;
+      # driver for the NIC, required in order to get an IP address
+      kernelModules = [ "igb" ];
+    };
   };
 
-  boot.kernelParams = [ "ip=dhcp" ];
-
-  time.timeZone = "America/Los_Angeles";
-
   hardware.opengl.driSupport = true;
 
   # Use systemd-networkd for networking