From 799e9fd22ef9a90325601909d608dcf175251d32 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Thu, 17 Oct 2019 08:03:24 +1000
Subject: [PATCH] Moved packages to pi_common

---
 Deployments/pi_common.nix | 13 +++++++++++++
 Networks/pi3B_rack.nix    |  5 +----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 Deployments/pi_common.nix

diff --git a/Deployments/pi_common.nix b/Deployments/pi_common.nix
new file mode 100644
index 0000000..9498092
--- /dev/null
+++ b/Deployments/pi_common.nix
@@ -0,0 +1,13 @@
+# Configuration common to all my servers
+
+{ config, pkgs, lib, ... }:
+
+{
+
+  environment = {       # Set the system-wide environment
+    systemPackages = with pkgs; [
+      lsusb             # Tools for working with USB devices, such as lsusb
+    ];
+  };
+
+}
diff --git a/Networks/pi3B_rack.nix b/Networks/pi3B_rack.nix
index 5dbc091..7a5b543 100644
--- a/Networks/pi3B_rack.nix
+++ b/Networks/pi3B_rack.nix
@@ -11,6 +11,7 @@
         <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
         ../Hardware/raspberry_pi_3_model_B.nix
         ../Deployments/host_common.nix
+        ../Deployments/pi_common.nix
         ../Hosts/pi-tri.nix
         ../Hosts/pi-ceithir/nix
       ];
@@ -34,10 +35,6 @@
       ];
     };
 
-    environment.systemPackages = with pkgs; [
-      lsusb   # Tools for working with USB devices, such as lsusb
-    ];
-
     system.stateVersion = "19.09"; # Did you read the comment?
     system.autoUpgrade.enable = true;
     system.autoUpgrade.channel = https://nixos.org/channels/nixos-19.09;