From b68b7b75faeba47bb5d3a22b06e9708fbe5e8705 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Tue, 20 Jun 2023 14:01:31 -0700
Subject: [PATCH] Pass package to demo config with overlay

---
 demo/default.nix | 4 ++--
 flake.nix        | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/demo/default.nix b/demo/default.nix
index 70cb86a..1e964a4 100644
--- a/demo/default.nix
+++ b/demo/default.nix
@@ -1,4 +1,4 @@
-flake: { pkgs, ... }:
+{ pkgs, ... }:
 
 {
   system.stateVersion = "22.11";
@@ -17,7 +17,7 @@ flake: { pkgs, ... }:
   };
 
   # Put intake on both users' PATH
-  environment.systemPackages = [ flake.packages.${pkgs.stdenv.hostPlatform.system}.default ];
+  environment.systemPackages = [ pkgs.intake ];
 
   # Set up intake for both users with an entry point at port 8080
   services.intake = {
diff --git a/flake.nix b/flake.nix
index 42e2ccb..7234215 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,14 +59,20 @@
       description = "A basic intake source config";
     };
 
+    nixosModules.default = {
+      options = {};
+      config.nixpkgs.overlays = [ self.overlays.default ];
+    };
+
     nixosModules.intake = import ./module.nix self;
 
     nixosConfigurations."demo" = makeOverridable nixosSystem {
       inherit system;
       modules = [
         nixos-shell.nixosModules.nixos-shell
+        self.nixosModules.default
         self.nixosModules.intake
-        (import ./demo self)
+        ./demo
       ];
     };
   };