Browse Source

BUGFIX: Disable broken parts of rpi config

main
parent
commit
19c39b20c6
Signed by: chris GPG Key ID: 3025DCBD46F81C0F
  1. 42
      README.org
  2. 4
      hosts/raspberry/configuration.nix
  3. 40
      hosts/raspberry/hardware.nix

42
README.org

@ -700,7 +700,7 @@ Deploy this configuration with ~sudo nixos-rebuild switch --flake /etc/dotfiles/
networking.wireless.enable = true; networking.wireless.enable = true;
networking.wireless.userControlled.enable = true; networking.wireless.userControlled.enable = true;
<<host-wifi-config>>
<<host-config-wifi>>
environment.systemPackages = [ environment.systemPackages = [
pkgs.libraspberrypi pkgs.libraspberrypi
@ -725,39 +725,39 @@ Deploy this configuration with ~sudo nixos-rebuild switch --flake /etc/dotfiles/
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
imports = [
inputs.nixos-hardware.nixosModules.raspberry-pi-4
];
# imports = [
# inputs.nixos-hardware.nixosModules.raspberry-pi-4
# ];
boot.kernelPackages = pkgs.linuxPackages_rpi4;
# boot.kernelPackages = pkgs.linuxPackages_rpi4;
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" ]; boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" ];
boot.kernelParams = [
"8250.nr_uarts=1"
"console=ttyAMA0,115200"
"console=tty1"
"cma=128M"
];
# boot.kernelParams = [
# "8250.nr_uarts=1"
# "console=ttyAMA0,115200"
# "console=tty1"
# "cma=128M"
# ];
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;
boot.loader.raspberryPi = {
enable = true;
version = 4;
firmwareConfig = ''
dtparam=sd_poll_once=on
dtparam=audio=on
'';
};
# boot.loader.raspberryPi = {
# enable = true;
# version = 4;
# firmwareConfig = ''
# dtparam=sd_poll_once=on
# dtparam=audio=on
# '';
# };
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.raspberry-pi."4".fkms-3d.enable = true;
# hardware.raspberry-pi."4".fkms-3d.enable = true;
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-label/NIXOS_SD";
device = "/dev/disk/by-uuid/444444444-4444-4444-8888-888888888888";
fsType = "ext4"; fsType = "ext4";
options = [ "noatime" ]; options = [ "noatime" ];
}; };

4
hosts/raspberry/configuration.nix

@ -7,7 +7,9 @@
networking.wireless.enable = true; networking.wireless.enable = true;
networking.wireless.userControlled.enable = true; networking.wireless.userControlled.enable = true;
# Pre-configured wireless networks.
networking.wireless.networks.MyWiFi_5C1870.pskRaw =
"409b3c85fef1c5737f284d2f82f20dc6023e41804e862d4fa26265ef8193b326";
environment.systemPackages = [ environment.systemPackages = [
pkgs.libraspberrypi pkgs.libraspberrypi

40
hosts/raspberry/hardware.nix

@ -2,39 +2,39 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
imports = [
inputs.nixos-hardware.nixosModules.raspberry-pi-4
];
# imports = [
# inputs.nixos-hardware.nixosModules.raspberry-pi-4
# ];
boot.kernelPackages = pkgs.linuxPackages_rpi4;
# boot.kernelPackages = pkgs.linuxPackages_rpi4;
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" ]; boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" ];
boot.kernelParams = [
"8250.nr_uarts=1"
"console=ttyAMA0,115200"
"console=tty1"
"cma=128M"
];
# boot.kernelParams = [
# "8250.nr_uarts=1"
# "console=ttyAMA0,115200"
# "console=tty1"
# "cma=128M"
# ];
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;
boot.loader.raspberryPi = {
enable = true;
version = 4;
firmwareConfig = ''
dtparam=sd_poll_once=on
dtparam=audio=on
'';
};
# boot.loader.raspberryPi = {
# enable = true;
# version = 4;
# firmwareConfig = ''
# dtparam=sd_poll_once=on
# dtparam=audio=on
# '';
# };
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.raspberry-pi."4".fkms-3d.enable = true;
# hardware.raspberry-pi."4".fkms-3d.enable = true;
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-label/NIXOS_SD";
device = "/dev/disk/by-uuid/444444444-4444-4444-8888-888888888888";
fsType = "ext4"; fsType = "ext4";
options = [ "noatime" ]; options = [ "noatime" ];
}; };

Loading…
Cancel
Save