From b882977647faa39a97ea4aa716ff560512311cbc Mon Sep 17 00:00:00 2001
From: Travis Staton <hello@travisstaton.com>
Date: Sat, 11 Mar 2023 12:42:51 -0500
Subject: [PATCH] move nixos module from rpi to nixosModules.raspberry-pi

---
 README.md | 27 ++++++++++++++++++++++-----
 flake.nix |  2 +-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 09a3b82..336a7f5 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,8 @@ and `rpi/config.nix`. The other modules are mostly wrappers that set
 {
   description = "raspberry-pi-nix example";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
-    raspberry-pi-nix = {
-      url = "github:tstat/raspberry-pi-nix";
-    };
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    raspberry-pi-nix = "github:tstat/raspberry-pi-nix";
   };
 
   outputs = { self, nixpkgs, raspberry-pi-nix }:
@@ -40,12 +38,31 @@ and `rpi/config.nix`. The other modules are mostly wrappers that set
           useDHCP = false;
           interfaces = { wlan0.useDHCP = true; };
         };
+        environment.systemPackages = with pkgs; [ bluez bluez-tools ];
+        hardware = {
+          bluetooth.enable = true;
+          raspberry-pi = {
+            config = {
+              all = {
+                base-dt-params = {
+                  # enable autoprobing of bluetooth driver
+                  # https://github.com/raspberrypi/linux/blob/c8c99191e1419062ac8b668956d19e788865912a/arch/arm/boot/dts/overlays/README#L222-L224
+                  krnbt = {
+                    enable = true;
+                    value = "on";
+                  };
+                };
+              };
+            };
+          };
+        };
       };
+
     in {
       nixosConfigurations = {
         rpi-example = nixosSystem {
           system = "aarch64-linux";
-          modules = [ raspberry-pi-nix.rpi basic-config ];
+          modules = [ raspberry-pi-nix.nixosModules.raspberry-pi basic-config ];
         };
       };
     };
diff --git a/flake.nix b/flake.nix
index 868a89f..c91be2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,6 @@
 
   outputs = srcs@{ self, ... }: {
     overlay = import ./overlay (builtins.removeAttrs srcs [ "self" ]);
-    rpi = import ./rpi { overlay = self.overlay; };
+    nixosModules.raspberry-pi = import ./rpi { overlay = self.overlay; };
   };
 }