diff --git a/configuration.nix b/configuration.nix index 2a15229..c417220 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,6 @@ { imports = [ ./pinebook_pro.nix + ./pinebook_pro-installer.nix ]; } diff --git a/nixos/sd-image-aarch64.nix b/nixos/sd-image-aarch64.nix index b55bee3..31bca5a 100644 --- a/nixos/sd-image-aarch64.nix +++ b/nixos/sd-image-aarch64.nix @@ -14,25 +14,6 @@ in boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; - boot.consoleLogLevel = lib.mkDefault 7; - - boot.kernelParams = [ - "cma=32M" - #"console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0" - - "console=ttyS2,1500000n8" - "earlycon=uart8250,mmio32,0xff1a0000" "earlyprintk" - - # The last console parameter will be where the boot process will print - # its messages. Comment or move abot ttyS2 for better serial debugging. - "console=tty0" - ]; - - services.mingetty.serialSpeed = [ 1500000 115200 57600 38400 9600 ]; - - boot.initrd.availableKernelModules = [ - ]; - sdImage = { populateRootCommands = '' mkdir -p ./files/boot diff --git a/pinebook_pro-installer.nix b/pinebook_pro-installer.nix new file mode 100644 index 0000000..27fd3a4 --- /dev/null +++ b/pinebook_pro-installer.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +# Things that are too opinionated for defaults. +{ + boot.kernelParams = [ + "cma=32M" + + "console=ttyS2,1500000n8" + "earlycon=uart8250,mmio32,0xff1a0000" "earlyprintk" + + # The last console parameter will be where the boot process will print + # its messages. Comment or move above ttyS2 for better serial debugging. + "console=tty0" + ]; + + services.mingetty.serialSpeed = [ 1500000 115200 57600 38400 9600 ]; + + boot.initrd.availableKernelModules = [ + ]; + + boot.consoleLogLevel = lib.mkDefault 7; +}