remove default.nix

default.nix

@@ -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
-  ];
-}

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;
 

modules/pipewire.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, lib, ... }:
 let
   cfg = config.sconfig.pipewire;
 in