From 17247f927d3cec408f6fc541629a5fef5344b07e Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sun, 19 Apr 2020 17:51:48 -0700
Subject: Unify dev packages and base packages

---
 Biz/packages.nix |  3 ++-
 shell.nix        | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Biz/packages.nix b/Biz/packages.nix
index 4ffbbf8..65bbe6c 100644
--- a/Biz/packages.nix
+++ b/Biz/packages.nix
@@ -1,5 +1,7 @@
 { pkgs, ... }:
 
+# Base set of packages to be expected everywhere.
+
 with pkgs;
 
 {
@@ -10,7 +12,6 @@ with pkgs;
     python3
     ranger
     telnet
-    tinc_pre
     traceroute
     vnstat
     wget
diff --git a/shell.nix b/shell.nix
index c0d1e6a..b141289 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,17 +4,18 @@
 
 let
   nixpkgs = import ./nix/nixpkgs.nix;
+  basepkgs = import ./Biz/packages.nix { inherit (nixpkgs) pkgs; };
+  devpkgs = with nixpkgs; [
+    hlint
+    niv
+    ormolu
+    python37Packages.black
+    python37Packages.pylint
+    wemux
+  ]
 in nixpkgs.mkShell ({
   name = "bizdev";
-  buildInputs = [
-    nixpkgs.git
-    nixpkgs.hlint
-    nixpkgs.niv
-    nixpkgs.ormolu
-    nixpkgs.python37Packages.black
-    nixpkgs.python37Packages.pylint
-    nixpkgs.wemux
-  ];
+  buildInputs = devpkgs ++ basepkgs.environment.systemPackages;
   shellHook = ''
     echo "biz" | ${nixpkgs.figlet}/bin/figlet | ${nixpkgs.lolcat}/bin/lolcat
   '';
-- 
cgit v1.2.3