From 4aef25101fd82eb2835286bbb83e462a6bdfb67f Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Fri, 28 May 2021 00:19:47 +0200
Subject: [PATCH] feat(rpi4): use nixos-hardware config

---
 flake.lock            | 17 +++++++++++++++++
 flake.nix             |  7 +++++--
 hardware/gpu-rpi4.nix |  8 +-------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index ac4a1b0..c274629 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,6 +61,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1620983891,
+        "narHash": "sha256-E2OKVgGo/cUqDsrIeYGVx64b4cxgzd7+bX33NHL0rbA=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "c4399b921fa7ff5f93ee10b3521b56b722ed74d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1621840840,
@@ -209,6 +225,7 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "neovim": "neovim",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
         "obelisk": "obelisk",
diff --git a/flake.nix b/flake.nix
index 27820c2..1316eb5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,8 @@
 {
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
+  inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   inputs.home-manager = {
@@ -33,8 +35,8 @@
     inputs.flake-utils.follows = "flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, home-manager, nur, neovim, obelisk
-    , photoprism-flake, pre-commit-hooks }:
+  outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur
+    , neovim, obelisk, photoprism-flake, pre-commit-hooks }:
     let
       overlays = {
         neovim = self: super: {
@@ -108,6 +110,7 @@
         system = "aarch64-linux";
         modules = [
           nixpkgs.nixosModules.notDetected
+          nixos-hardware.nixosModules.raspberry-pi-4
           {
             home-manager.users.felschr.imports = [ homeManagerModules.git ];
           }
diff --git a/hardware/gpu-rpi4.nix b/hardware/gpu-rpi4.nix
index f644f44..8f99fcb 100644
--- a/hardware/gpu-rpi4.nix
+++ b/hardware/gpu-rpi4.nix
@@ -6,13 +6,7 @@
     setLdLibraryPath = true;
     package = pkgs.mesa_drivers;
   };
-  hardware.deviceTree = {
-    overlays = [ "${pkgs.device-tree_rpi.overlays}/vc4-fkms-v3d.dtbo" ];
-  };
-  services.xserver = {
-    enable = false;
-    videoDrivers = [ "modesetting" ];
-  };
+  hardware.raspberry-pi."4".fkms-3d.enable = true;
   boot.loader.raspberryPi.firmwareConfig = ''
     gpu_mem=320
   '';