add nix-tools and use <darwin-config> instead of config.nix

1 files changed, 8 insertions, 2 deletions

diff --git a/default.nix b/default.nix
index 6cffc27..ae5156e 100644
--- a/default.nix
+++ b/default.nix
@@ -12,14 +12,20 @@ let
         ./modules/system/defaults
         ./modules/system/etc.nix
         ./modules/system/launchd.nix
+        ./modules/nix
         ./modules/environment
         ./modules/launchd
         ./modules/services/activate-system.nix
         ./modules/services/nix-daemon.nix
         ./modules/programs/tmux.nix
-        ./modules/programs/nix-darwin.nix
       ];
   };
 
+  system = eval.config.system.build.toplevel;
+
 in
-  eval
+
+{
+  inherit (eval) config;
+  inherit system;
+}