diff options
| author | jeschli <jeschli@gmail.com> | 2018-01-21 10:40:42 +0000 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-01-21 10:40:42 +0000 |
| commit | b9dc505fd6c5cbff7f8c07850a2d6789b99ff174 (patch) | |
| tree | ee47595ed9db2821b8fcf858a4e0cead14cd94f0 /jeschli/1systems | |
| parent | 1dadc45ab5d78f71886cac1860ee77c7e60e26ea (diff) | |
| parent | e5459f79b628cd3783e5efe96793c7a09bec0be1 (diff) | |
Merge branch 'master' of prism.i:stockholm
Diffstat (limited to 'jeschli/1systems')
| -rw-r--r-- | jeschli/1systems/bln/config.nix | 1 | ||||
| -rw-r--r-- | jeschli/1systems/enklave/config.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 9e5f8c5..9c491c8 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 0100890..76e7186 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 = [ |