l lasspi.r: fix booting with 22.05
This commit is contained in:
parent
7eb5804cf7
commit
fd67132ada
@ -1,4 +1,3 @@
|
|||||||
with import <stockholm/lib>;
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
in
|
in
|
||||||
@ -18,9 +17,9 @@ in
|
|||||||
};
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
vim
|
vim
|
||||||
rxvt_unicode.terminfo
|
rxvt-unicode-unwrapped.terminfo
|
||||||
];
|
];
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
system.stateVersion = "21.05";
|
system.stateVersion = "22.05";
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
{
|
{
|
||||||
# This configuration worked on 09-03-2021 nixos-unstable @ commit 102eb68ceec
|
|
||||||
# The image used https://hydra.nixos.org/build/134720986
|
|
||||||
imports = [
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./config.nix
|
./config.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
# kernelPackages = pkgs.linuxPackages_rpi4;
|
# kernelPackages = pkgs.linuxPackages_rpi4;
|
||||||
tmpOnTmpfs = true;
|
tmpOnTmpfs = true;
|
||||||
initrd.availableKernelModules = [ "usbhid" "usb_storage" ];
|
initrd.availableKernelModules = [ "usbhid" "usb_storage" "xhci_pci" ];
|
||||||
# ttyAMA0 is the serial console broken out to the GPIO
|
# ttyAMA0 is the serial console broken out to the GPIO
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"8250.nr_uarts=1"
|
"8250.nr_uarts=1"
|
||||||
@ -20,19 +19,23 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.loader.raspberryPi = {
|
# boot.loader.raspberryPi = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
version = 4;
|
# version = 4;
|
||||||
};
|
# # uboot.enable = true;
|
||||||
|
# };
|
||||||
boot.loader.grub.enable = false;
|
boot.loader.grub.enable = false;
|
||||||
|
boot.loader.generic-extlinux-compatible.enable = true;
|
||||||
|
|
||||||
# Required for the Wireless firmware
|
# Required for the Wireless firmware
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
|
networking.interfaces.eth0.useDHCP = true;
|
||||||
|
|
||||||
# Assuming this is installed on top of the disk image.
|
# Assuming this is installed on top of the disk image.
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "/dev/disk/by-label/NIXOS_SD";
|
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
options = [ "noatime" ];
|
options = [ "noatime" ];
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user