summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-01-21 10:40:42 +0000
committerjeschli <jeschli@gmail.com>2018-01-21 10:40:42 +0000
commit7d0c94e36a0e1a90d4fc69de23467b67b01c9bdd (patch)
tree201c9c95b54f59c1434e8afa2df0eeb2d9b780c2 /jeschli/1systems
parentbaf4fc520b9faae6ad07c1b9f6d6623b92768ce6 (diff)
parent3bd62207d4b60db4ca5f89bb84dc842b62bdfbaf (diff)
Merge branch 'master' of prism.i:stockholm
Diffstat (limited to 'jeschli/1systems')
-rw-r--r--jeschli/1systems/bln/config.nix1
-rw-r--r--jeschli/1systems/enklave/config.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 9e5f8c52e..9c491c8a1 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -8,6 +8,7 @@
imports =
[ # Include the results of the hardware scan.
<stockholm/jeschli>
+ <stockholm/jeschli/2configs/virtualbox.nix>
./hardware-configuration.nix
# ./dcso-vpn.nix
];
diff --git a/jeschli/1systems/enklave/config.nix b/jeschli/1systems/enklave/config.nix
index 010089017..76e718699 100644
--- a/jeschli/1systems/enklave/config.nix
+++ b/jeschli/1systems/enklave/config.nix
@@ -4,6 +4,7 @@
imports = [
<stockholm/jeschli>
<stockholm/jeschli/2configs/retiolum.nix>
+ <stockholm/jeschli/2configs/IM.nix>
<stockholm/jeschli/2configs/os-templates/CentOS-7-64bit.nix>
{
networking.dhcpcd.allowInterfaces = [