diff --git a/hosts/marisa/.boot.nix.swp b/hosts/marisa/.boot.nix.swp new file mode 100644 index 0000000..6def28f Binary files /dev/null and b/hosts/marisa/.boot.nix.swp differ diff --git a/hosts/marisa/boot.nix b/hosts/marisa/boot.nix index 37ef818..7f14123 100755 --- a/hosts/marisa/boot.nix +++ b/hosts/marisa/boot.nix @@ -1,9 +1,9 @@ { config, pkgs, ... }: { boot = { - kernelParams = [ "console=ttyS0,115200n8" "console=tty0" ]; - # kernelPackages = pkgs.linuxPackages_rpi4; //this sucks - initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "uas" "pcie-brcmstb" ]; + kernelParams = [ "console=ttyS0,115200n8" "console=ttyAMA0,115200" "console=tty0" "boot.shell_on_fail" ]; + kernelPackages = pkgs.linuxPackages_5_10; + initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "uas" "pcie-brcmstb" "vc4" ]; loader = { grub.enable = false; generic-extlinux-compatible.enable = true; diff --git a/hosts/marisa/hardware.nix b/hosts/marisa/hardware.nix index 1d53f20..baea1a3 100755 --- a/hosts/marisa/hardware.nix +++ b/hosts/marisa/hardware.nix @@ -5,7 +5,7 @@ { fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + { device = "/dev/disk/by-label/NIXOS_SD"; fsType = "ext4"; }; @@ -24,5 +24,6 @@ ]; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.firmware = [ pkgs.raspberrypiWirelessFirmware ]; + #hardware.firmware = [ pkgs.raspberrypiWirelessFirmware ]; + hardware.enableRedistributableFirmware = true; }