summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-04 20:11:18 +0200
committerlassulus <lass@blue.r>2018-09-04 20:11:18 +0200
commit58fe54d3f9ae616bbb3f9b0366bb7bd5b96a099d (patch)
tree9763541597c67dd2ff833995ddddc31b8de679ab /jeschli/1systems
parentc1e692217834de86416b04c04958c791113b11cc (diff)
parent228ca863767edc07ae50c82034d873ee7ef17310 (diff)
Merge remote-tracking branch 'prism/staging/jeschli'
Diffstat (limited to 'jeschli/1systems')
-rw-r--r--jeschli/1systems/brauerei/config.nix1
-rw-r--r--jeschli/1systems/enklave/config.nix1
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 = [