summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/cloudkrebs.nix8
-rw-r--r--lass/1systems/echelon.nix9
2 files changed, 11 insertions, 6 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 0aca2146d..17915e087 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -5,11 +5,9 @@ let
inherit (lib) head;
ip = (head config.krebs.build.host.nets.internet.addrs4);
- r_ip = (head config.krebs.build.host.nets.retiolum.addrs4);
in {
imports = [
- ../../tv/2configs/CAC-Developer-2.nix
- ../../tv/2configs/CAC-CentOS-7-64bit.nix
+ ../2configs/os-templates/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/retiolum.nix
../2configs/fastpoke-pages.nix
@@ -28,6 +26,10 @@ in {
];
}
+ {
+ nix.maxJobs = 1;
+ sound.enable = false;
+ }
];
krebs.build = {
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index e0948d95e..feaf77ef6 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -4,11 +4,10 @@ let
inherit (import ../4lib { inherit pkgs lib; }) getDefaultGateway;
inherit (lib) head;
- ip = (head config.krebs.hosts.echelon.nets.internet.addrs4);
+ ip = (head config.krebs.build.host.nets.internet.addrs4);
in {
imports = [
- ../../tv/2configs/CAC-Developer-2.nix
- ../../tv/2configs/CAC-CentOS-7-64bit.nix
+ ../2configs/os-templates/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/retiolum.nix
../2configs/realwallpaper-server.nix
@@ -31,6 +30,10 @@ in {
];
}
+ {
+ nix.maxJobs = 1;
+ sound.enable = false;
+ }
];
krebs.build = {