diff options
| author | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
| commit | 03764d6765f8d2734d0960bc75cc6856bf0893d8 (patch) | |
| tree | b8cbbdc3a0381b5d1b1d08149c38a6bd5be5e9c5 /jeschli/1systems | |
| parent | 86466154f11748365cdab50b6ac113bdfd5542be (diff) | |
| parent | 96c4ab61202f515c7a361ef76c398e542771d6b4 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'jeschli/1systems')
| -rw-r--r-- | jeschli/1systems/brauerei/config.nix | 1 | ||||
| -rw-r--r-- | jeschli/1systems/enklave/config.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index e200cbcd4..4cd544a66 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -8,6 +8,7 @@ <stockholm/jeschli/2configs/emacs.nix> <stockholm/jeschli/2configs/xdg.nix> <stockholm/jeschli/2configs/xserver> + <stockholm/jeschli/2configs/steam.nix> <stockholm/jeschli/2configs/virtualbox.nix> ]; diff --git a/jeschli/1systems/enklave/config.nix b/jeschli/1systems/enklave/config.nix index 470566a8b..cadec3cab 100644 --- a/jeschli/1systems/enklave/config.nix +++ b/jeschli/1systems/enklave/config.nix @@ -5,6 +5,7 @@ <stockholm/jeschli> <stockholm/jeschli/2configs/retiolum.nix> <stockholm/jeschli/2configs/IM.nix> + <stockholm/jeschli/2configs/git.nix> <stockholm/jeschli/2configs/os-templates/CentOS-7-64bit.nix> { networking.dhcpcd.allowInterfaces = [ |