From 84b5a128627cb032befbdb235562bf1a9d781172 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <hi@m7.rs>
Date: Mon, 31 Aug 2026 19:00:18 -0300
Subject: [PATCH] Revert "hosts/merope: switch to mainline Linux"

This reverts commit ee74ddbfec082aea42581dc7e09764f34a6936d9.
---
 hosts/nixos/merope/hardware-configuration.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/hosts/nixos/merope/hardware-configuration.nix b/hosts/nixos/merope/hardware-configuration.nix
index f7585ed3..63a99563 100644
--- a/hosts/nixos/merope/hardware-configuration.nix
+++ b/hosts/nixos/merope/hardware-configuration.nix
@@ -12,8 +12,6 @@
   ];
 
   boot = {
-    # The server does not use the Pi vendor media interfaces.
-    kernelPackages = pkgs.linuxPackages;
     initrd = {
       availableKernelModules = ["xhci_pci"];
     };
@@ -140,13 +138,7 @@
 
   fileSystems."/firmware".neededForBoot = lib.mkDefault true;
   hardware.raspberry-pi = {
-    configtxt = {
-      settings.all.avoid_warnings = true;
-      deviceTreeOverlays.all = [
-        # Decrease CMA reservation
-        { vc4-kms-v3d."cma-256" = true; }
-      ];
-    };
+    configtxt.settings.all.avoid_warnings = true;
     firmware = {
       enable = true;
       path = "/firmware";
@@ -157,7 +149,13 @@
     };
   };
 
-  hardware.raspberry-pi."4".i2c1.enable = true;
+  hardware.raspberry-pi."4" = {
+    i2c1.enable = true;
+    fkms-3d = {
+      enable = true;
+      cma = 1024;
+    };
+  };
   hardware.graphics.enable = true;
 
   # Avoiding some heavy IO