diff options
Diffstat (limited to 'machines/fourmi')
| -rw-r--r-- | machines/fourmi/devices.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/machines/fourmi/devices.nix b/machines/fourmi/devices.nix index 56d243f..1e55692 100644 --- a/machines/fourmi/devices.nix +++ b/machines/fourmi/devices.nix @@ -3,6 +3,7 @@ pkgs, lib, nixos-hardware, + mhs35-drm, ... }: @@ -10,10 +11,16 @@ # correctly configure hardware in this pi server. imports = [ nixos-hardware.nixosModules.raspberry-pi-4 - ../../modules/hardware/ads7846.nix - #../../modules/hardware/ili9486.nix + mhs35-drm.nixosModules.default ]; + # gpio display visualizing the goings-on on fourmi! + # this is a weird offbrand ili9486 (maybe?) 3.5" spi panel + # with an ads7846 touch screen which is not actually compatible + # with the normal drm driver, so we have our own! + # see the flake input and associated repo for more! + hardware.mhs35.enable = true; + # boot settings boot = { kernelPackages = lib.mkForce pkgs.linuxPackages_rpi4; @@ -37,7 +44,8 @@ # apply rpi4-specific device tree from nixos-hardware. hardware = { raspberry-pi."4" = { - apply-overlays-dtmerge.enable = true; + # applied in our flake as per-machine overlay. + apply-overlays-dtmerge.enable = false; fkms-3d.enable = true; }; deviceTree = { @@ -66,13 +74,11 @@ name = "end0"; DHCP = "yes"; dhcpV4Config.RouteMetric = 100; - networkConfig.RequiredForOnline = "no"; }; "20-wireless" = { name = "wlan0"; DHCP = "yes"; dhcpV4Config.RouteMetric = 600; - networkConfig.RequiredForOnline = "no"; }; }; }; |