Merge branch 'master' of gum:stockholm into fix-cert

This commit is contained in:
makefu 2016-01-22 11:35:00 +01:00
commit c23b898e24
3 changed files with 22 additions and 1 deletions

19
1systems/wbob.nix Normal file
View file

@ -0,0 +1,19 @@
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
../2configs/main-laptop.nix
];
krebs = {
enable = true;
retiolum.enable = true;
build.host = config.krebs.hosts.wbob;
};
boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" ];
boot.kernelModules = [ "kvm-intel" ];
fileSystems."/" = {
device = "/dev/sda1";
fsType = "ext4";
};
}

View file

@ -16,6 +16,9 @@ let
desc = "Tinc Advanced Graph Generation";
};
cac = { };
init-stockholm = {
desc = "Init stuff for stockholm";
};
};
priv-repos = mapAttrs make-priv-repo {

View file

@ -4,7 +4,6 @@ with lib;
{
krebs.retiolum = {
enable = true;
hosts = ../../krebs/Zhosts;
connectTo = [
"gum"
"pigstarter"