From 8b08077e40b6d91a05f441ec9820d467d6645a86 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 11 Jun 2021 21:32:23 -0400
Subject: [PATCH] remove default.nix

---
 .update-on-nixos-rebuild |  0
 default.nix              | 17 -----------------
 flake.nix                | 17 ++++++++++++++++-
 modules/pipewire.nix     |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 .update-on-nixos-rebuild
 delete mode 100644 default.nix

diff --git a/.update-on-nixos-rebuild b/.update-on-nixos-rebuild
deleted file mode 100644
index e69de29..0000000
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 5a4c391..0000000
--- a/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./modules/alacritty.nix
-    ./modules/baseline.nix
-    ./modules/cli.nix
-    ./modules/gnome.nix
-    ./modules/phpipam.nix
-    ./modules/pipewire.nix
-    ./modules/profiles.nix
-    ./modules/scansnap_s1300.nix
-    ./modules/scroll-boost
-    ./modules/security-tools.nix
-    ./modules/status-on-console.nix
-    ./modules/sway.nix
-  ];
-}
diff --git a/flake.nix b/flake.nix
index 0058b23..7cb9d2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,22 @@
 
   outputs = { self, nixpkgs, ... }@inputs:
     {
-      nixosModule = { ... }: { imports = [ ./. ]; };
+      nixosModules = {
+        alacritty = ./modules/alacritty.nix;
+        baseline = ./modules/baseline.nix;
+        cli = ./modules/cli.nix;
+        gnome = ./modules/gnome.nix;
+        phpipam = ./modules/phpipam.nix;
+        pipewire = ./modules/pipewire.nix;
+        profiles = ./modules/profiles.nix;
+        scansnap_s1300 = ./modules/scansnap_s1300.nix;
+        scroll-boost = ./modules/scroll-boost;
+        security-tools = ./modules/security-tools.nix;
+        status-on-console = ./modules/status-on-console.nix;
+        sway = ./modules/sway.nix;
+      };
+
+      nixosModule = { ... }: { imports = builtins.attrValues self.nixosModules; };
 
       nixosConfigurations = self.lib.getHosts inputs ./hosts;
 
diff --git a/modules/pipewire.nix b/modules/pipewire.nix
index 051e745..46c4eed 100644
--- a/modules/pipewire.nix
+++ b/modules/pipewire.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, lib, ... }:
 let
   cfg = config.sconfig.pipewire;
 in