l: move more config to base.nix

This commit is contained in:
lassulus 2015-10-19 14:00:15 +02:00
parent 35b476288a
commit 1d4f2bf011
5 changed files with 22 additions and 75 deletions

View File

@ -27,26 +27,9 @@ in {
} }
{ {
nix.maxJobs = 1;
sound.enable = false; sound.enable = false;
} }
]; ];
krebs.build = { krebs.build.host = config.krebs.hosts.cloudkrebs;
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";
} }

View File

@ -31,26 +31,9 @@ in {
} }
{ {
nix.maxJobs = 1;
sound.enable = false; sound.enable = false;
} }
]; ];
krebs.build = { krebs.build.host = config.krebs.hosts.echelon;
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;
} }

View File

@ -24,22 +24,8 @@
../2configs/skype.nix ../2configs/skype.nix
]; ];
krebs.build = { krebs.build.host = config.krebs.hosts.mors;
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";
};
};
};
networking.hostName = "mors";
networking.wireless.enable = true; networking.wireless.enable = true;
networking.extraHosts = '' networking.extraHosts = ''
@ -50,8 +36,6 @@
10.243.206.102 apanowicz.de 10.243.206.102 apanowicz.de
''; '';
nix.maxJobs = 4;
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View File

@ -24,26 +24,9 @@ with builtins;
} }
]; ];
krebs.build = { krebs.build.host = config.krebs.hosts.uriel;
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";
networking.wireless.enable = true; networking.wireless.enable = true;
nix.maxJobs = 2;
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View File

@ -38,14 +38,28 @@ with lib;
} }
]; ];
networking.hostName = config.krebs.build.host.name;
nix.maxJobs = config.krebs.build.host.cores;
krebs = { krebs = {
enable = true; enable = true;
search-domain = "retiolum"; search-domain = "retiolum";
exim-retiolum.enable = true; exim-retiolum.enable = true;
build.source = { build = {
git.nixpkgs = { user = config.krebs.users.lass;
url = https://github.com/Lassulus/nixpkgs; source = {
rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da"; 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";
};
}; };
}; };
}; };