diff options
| author | Alan Pearce | 2020-12-31 21:47:47 +0100 |
|---|---|---|
| committer | Alan Pearce | 2021-01-12 21:03:31 +0100 |
| commit | 4d230ecf19a7709d8fabdd1cae155057215576d0 (patch) | |
| tree | 4990bfa9a7a43a0333b7b65f020fb625e70e60ab /system | |
| parent | 718ebf3e3fe216f88308b8cb44266cbb97b78e8a (diff) | |
| download | nixfiles-4d230ecf19a7709d8fabdd1cae155057215576d0.tar.lz nixfiles-4d230ecf19a7709d8fabdd1cae155057215576d0.tar.zst nixfiles-4d230ecf19a7709d8fabdd1cae155057215576d0.zip | |
Extract always-requested system packages to module
Diffstat (limited to 'system')
| -rw-r--r-- | system/mba.nix | 1 | ||||
| -rw-r--r-- | system/prefect.nix | 1 | ||||
| -rw-r--r-- | system/satoshipad.nix | 1 | ||||
| -rw-r--r-- | system/settings/base.nix | 7 | ||||
| -rw-r--r-- | system/settings/programs/base.nix | 10 |
5 files changed, 13 insertions, 7 deletions
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 + ]; +} |