add nix-tools to environment.systemPackages by default

5 files changed, 17 insertions, 11 deletions

diff --git a/README.md b/README.md
index 3cc617e..579ab69 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,7 @@ Checkout [modules/examples](https://github.com/LnL7/nix-darwin/tree/master/modul
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages =
-    [ # Include nix-tools
-      config.system.build.nix
-
-      pkgs.nix-repl
+    [ pkgs.nix-repl
     ];
 
   environment.etc."bashrc".text = ''
@@ -69,5 +66,8 @@ Checkout [modules/examples](https://github.com/LnL7/nix-darwin/tree/master/modul
     ${config.system.build.setEnvironment}
     ${config.system.build.setAliases}
   '';
+
+  services.activate-system.enable = true;
+
 }
 ```
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix
index 06f876f..ed93174 100644
--- a/modules/examples/lnl.nix
+++ b/modules/examples/lnl.nix
@@ -1,11 +1,10 @@
 { config, lib, pkgs, ... }:
 {
   environment.systemPackages =
-    [ config.system.build.nix
-
-      pkgs.lnl.zsh
+    [ pkgs.lnl.zsh
       pkgs.lnl.tmux
       pkgs.lnl.vim
+
       pkgs.curl
       pkgs.fzf
       pkgs.gettext
diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix
index 1dbe3f1..fd13cf8 100644
--- a/modules/examples/simple.nix
+++ b/modules/examples/simple.nix
@@ -4,10 +4,7 @@
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages =
-    [ # Include nix-tools
-      config.system.build.nix
-
-      pkgs.nix-repl
+    [ pkgs.nix-repl
     ];
 
   environment.etc."bashrc".text = ''
@@ -25,4 +22,7 @@
     ${config.system.build.setEnvironment}
     ${config.system.build.setAliases}
   '';
+
+  services.activate-system.enable = true;
+
 }
diff --git a/modules/nix/nix-tools.nix b/modules/nix/nix-tools.nix
index 5c33697..11b222b 100644
--- a/modules/nix/nix-tools.nix
+++ b/modules/nix/nix-tools.nix
@@ -15,5 +15,10 @@ in
       ln -s ${tools.darwin-rebuild} $out/bin/darwin-rebuild
     '';
 
+    environment.systemPackages =
+      [ # Include nix-tools by default
+        config.system.build.nix
+      ];
+
   };
 }
diff --git a/modules/nix/nixpkgs.nix b/modules/nix/nixpkgs.nix
index 3b09369..7bef9ee 100644
--- a/modules/nix/nixpkgs.nix
+++ b/modules/nix/nixpkgs.nix
@@ -66,8 +66,10 @@ in
   };
 
   config = {
+
     _module.args.pkgs = import <nixpkgs> {
       inherit (config.nixpkgs) config;
     };
+
   };
 }