diff options
| author | Profpatsch <mail@profpatsch.de> | 2021-03-05 22:29:33 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2021-03-05 22:56:29 +0100 |
| commit | 875a61617d141fb89fecdb2665ed47f120aad007 (patch) | |
| tree | e20c172b406e632d367345db016b5fa55fc33911 /machines/profpatsch/base-server.nix | |
| parent | 816437169662bff72bbf35206f8ae2a6ccc9e91b (diff) | |
machines/profpatsch: fix git overwriting gitFull
I had a clash between the base config and my workstation, which lead to `git send-email` not being available because `git` (minimal) was shadowing `gitFull`.
Diffstat (limited to 'machines/profpatsch/base-server.nix')
| -rw-r--r-- | machines/profpatsch/base-server.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/machines/profpatsch/base-server.nix b/machines/profpatsch/base-server.nix index 7b0a714a..26b2f005 100644 --- a/machines/profpatsch/base-server.nix +++ b/machines/profpatsch/base-server.nix @@ -13,7 +13,14 @@ in options = ((import ../../pkgs/profpatsch/nixos-toml-modules.nix { inherit lib; }).readAnyToml ./base-server-options.toml).options ; - config = cfgImports.config; + config = + cfgImports.config + # TODO: how to handle a reference to pkgs? + // { + # This can’t be in base.nix, because the workstations + # have gitFull which leads to env collisions. + environment.systemPackages = [ pkgs.git ]; + }; # options.vuizvui.user.profpatsch.server.sshPort = lib.traceValSeqN 3 (lib.mkOption { |