summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lass/1systems/cloudkrebs.nix19
-rw-r--r--lass/1systems/echelon.nix19
-rw-r--r--lass/1systems/mors.nix18
-rw-r--r--lass/1systems/uriel.nix19
-rw-r--r--lass/2configs/base.nix22
5 files changed, 22 insertions, 75 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index f3e039433..ab24b584b 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -27,26 +27,9 @@ in {
}
{
- nix.maxJobs = 1;
sound.enable = false;
}
];
- krebs.build = {
- user = config.krebs.users.lass;
- host = config.krebs.hosts.cloudkrebs;
- source = {
- dir.secrets = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/secrets/${config.krebs.build.host.name}";
- };
- dir.stockholm = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/dev/stockholm";
- };
- };
- };
-
- networking.hostName = "cloudkrebs";
-
+ krebs.build.host = config.krebs.hosts.cloudkrebs;
}
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index feaf77ef6..80cb51060 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -31,26 +31,9 @@ in {
}
{
- nix.maxJobs = 1;
sound.enable = false;
}
];
- krebs.build = {
- user = config.krebs.users.lass;
- host = config.krebs.hosts.echelon;
- source = {
- dir.secrets = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/secrets/${config.krebs.build.host.name}";
- };
- dir.stockholm = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/dev/stockholm";
- };
- };
- };
-
- networking.hostName = config.krebs.build.host.name;
-
+ krebs.build.host = config.krebs.hosts.echelon;
}
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index a21518e14..fcdabed40 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -24,22 +24,8 @@
../2configs/skype.nix
];
- krebs.build = {
- user = config.krebs.users.lass;
- host = config.krebs.hosts.mors;
- source = {
- dir.secrets = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/secrets/${config.krebs.build.host.name}";
- };
- dir.stockholm = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/dev/stockholm";
- };
- };
- };
+ krebs.build.host = config.krebs.hosts.mors;
- networking.hostName = "mors";
networking.wireless.enable = true;
networking.extraHosts = ''
@@ -50,8 +36,6 @@
10.243.206.102 apanowicz.de
'';
- nix.maxJobs = 4;
-
hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true;
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index d18559779..3514459fd 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -24,26 +24,9 @@ with builtins;
}
];
- krebs.build = {
- user = config.krebs.users.lass;
- target = "root@uriel";
- host = config.krebs.hosts.uriel;
- source = {
- dir.secrets = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/secrets/${config.krebs.build.host.name}";
- };
- dir.stockholm = {
- host = config.krebs.hosts.mors;
- path = "/home/lass/dev/stockholm";
- };
- };
- };
-
- networking.hostName = "uriel";
+ krebs.build.host = config.krebs.hosts.uriel;
networking.wireless.enable = true;
- nix.maxJobs = 2;
hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true;
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index f313054d9..2e42f86ae 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -38,14 +38,28 @@ with lib;
}
];
+ networking.hostName = config.krebs.build.host.name;
+ nix.maxJobs = config.krebs.build.host.cores;
+
krebs = {
enable = true;
search-domain = "retiolum";
exim-retiolum.enable = true;
- build.source = {
- git.nixpkgs = {
- url = https://github.com/Lassulus/nixpkgs;
- rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da";
+ build = {
+ user = config.krebs.users.lass;
+ source = {
+ git.nixpkgs = {
+ url = https://github.com/Lassulus/nixpkgs;
+ rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da";
+ };
+ dir.secrets = {
+ host = config.krebs.hosts.mors;
+ path = "/home/lass/secrets/${config.krebs.build.host.name}";
+ };
+ dir.stockholm = {
+ host = config.krebs.hosts.mors;
+ path = "/home/lass/stockholm";
+ };
};
};
};