From 679497cf607e59cb4c62d80174228e776369751f Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Wed, 6 Apr 2022 07:04:03 -0700 Subject: refactor boot configuration to a module We don't need the previous `hosts/common/system` configs anymore, as everything has been moved out. We keep some boot configuration for carmel in the host configuration for now, but I need to check why I don't have similar settings for tahoe (since I also need to unlock the host remotely). --- hosts/carmel/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'hosts/carmel/default.nix') diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index 7e48b5d..61599d6 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -3,6 +3,7 @@ { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./boot.nix ./sound.nix ./networking.nix ../common/desktop @@ -10,16 +11,6 @@ ../common/system/boot-ssh.nix ]; - 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" ]; - }; - }; - hardware.opengl.driSupport = true; # This value determines the NixOS release from which the default -- cgit 1.4.1