From 6d22256a85df7228a356a802dbc513c8abeeb2b7 Mon Sep 17 00:00:00 2001
From: Linnnus <linnnus@users.noreply.github.com>
Date: Sun, 1 Oct 2023 21:48:51 +0200
Subject: Export modules

---
 flake.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 2d2332b..5384e10 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,9 @@
         metadata = nixpkgs.lib.importTOML ./metadata.toml;
       };
 
+      darwinModules = builtins.attrValues (import ./modules/darwin);
+      nixosModules  = builtins.attrValues (import ./modules/nixos);
+
       # This is a function that generates an attribute by calling a function
       # you pass to it, with each system as an argument. `systems` lists all
       # supported systems.
@@ -52,10 +55,7 @@
             ./hosts/muhammed/configuration.nix
             ./hosts/common.nix
             ./home
-            # FIXME: Get the following to work without nix-darwin bithcing about unused NixOS options.
-            # ./modules
-            # ./services
-          ];
+          ] ++ darwinModules;
         };
       };
 
@@ -70,14 +70,15 @@
             ./hosts/ahmed/configuration.nix
             ./hosts/common.nix
             ./home
-	    ./modules
-            ./services
-          ];
+          ] ++ nixosModules;
         };
       };
 
       packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
 
       overlays = import ./overlays;
+
+      darwinModules = import ./modules/darwin;
+      nixosModules = import ./modules/nixos;
     };
 }
-- 
cgit v1.2.3