From 4d230ecf19a7709d8fabdd1cae155057215576d0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 31 Dec 2020 21:47:47 +0100
Subject: Extract always-requested system packages to module

---
 system/mba.nix                    |  1 +
 system/prefect.nix                |  1 +
 system/satoshipad.nix             |  1 +
 system/settings/base.nix          |  7 -------
 system/settings/programs/base.nix | 10 ++++++++++
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 system/settings/programs/base.nix

diff --git a/system/mba.nix b/system/mba.nix
index 763c9620..cd4d5a5b 100644
--- a/system/mba.nix
+++ b/system/mba.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./settings/darwin.nix
+    ./settings/programs/base.nix
     ./settings/programs/shell.nix
   ];
 
diff --git a/system/prefect.nix b/system/prefect.nix
index ce1ad9cc..28a5e9a6 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -25,6 +25,7 @@
     ./settings/services/syncthing.nix
     ./settings/services/zeroconf.nix
     ./settings/user-interface.nix
+    ./settings/programs/base.nix
     ./settings/programs/gnupg.nix
     ./settings/programs/i3.nix
     ./settings/programs/shell.nix
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index 4c0c1679..13302537 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -22,6 +22,7 @@
     ./settings/hardware/keyboard.nix
     ./settings/hardware/trackball.nix
     ./settings/hardware/trezor.nix
+    ./settings/programs/base.nix
     ./settings/programs/gnupg.nix
     ./settings/programs/i3.nix
     ./settings/programs/shell.nix
diff --git a/system/settings/base.nix b/system/settings/base.nix
index 2c7f61dc..d103639c 100644
--- a/system/settings/base.nix
+++ b/system/settings/base.nix
@@ -6,13 +6,6 @@
   ];
   boot.loader.timeout = lib.mkDefault 1;
 
-  environment.systemPackages = with pkgs; [
-    nix-index
-    cachix
-    vim
-    zstd
-  ];
-
   programs.zsh = {
     histFile = "\${XDG_DATA_HOME}/zsh/history";
   };
diff --git a/system/settings/programs/base.nix b/system/settings/programs/base.nix
new file mode 100644
index 00000000..edc98c94
--- /dev/null
+++ b/system/settings/programs/base.nix
@@ -0,0 +1,10 @@
+{ pkgs, ...}:
+
+{
+  environment.systemPackages = with pkgs; [
+    nix-index
+    cachix
+    vim
+    zstd
+  ];
+}
-- 
cgit 1.4.1