all repos — nixfiles @ 4d230ecf19a7709d8fabdd1cae155057215576d0

System and user configuration, managed by nix and home-manager

Extract always-requested system packages to module
Alan Pearce alan@alanpearce.eu
Thu, 31 Dec 2020 21:47:47 +0100
commit

4d230ecf19a7709d8fabdd1cae155057215576d0

parent

718ebf3e3fe216f88308b8cb44266cbb97b78e8a

M system/mba.nixsystem/mba.nix
@@ -3,6 +3,7 @@ {
   imports = [
     ./settings/darwin.nix
+    ./settings/programs/base.nix
     ./settings/programs/shell.nix
   ];
 
M system/prefect.nixsystem/prefect.nix
@@ -25,6 +25,7 @@ ./settings/hardware/trezor.nix     ./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
M system/satoshipad.nixsystem/satoshipad.nix
@@ -22,6 +22,7 @@ ./settings/hardware/network-manager.nix     ./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
M system/settings/base.nixsystem/settings/base.nix
@@ -6,13 +6,6 @@ ../modules/nextdns.nix   ];
   boot.loader.timeout = lib.mkDefault 1;
 
-  environment.systemPackages = with pkgs; [
-    nix-index
-    cachix
-    vim
-    zstd
-  ];
-
   programs.zsh = {
     histFile = "\${XDG_DATA_HOME}/zsh/history";
   };
A system/settings/programs/base.nix
@@ -0,0 +1,10 @@+{ pkgs, ...}:
+
+{
+  environment.systemPackages = with pkgs; [
+    nix-index
+    cachix
+    vim
+    zstd
+  ];
+}