diff options
| author | nin <nineinchnade@gmail.com> | 2017-10-17 19:54:15 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-10-17 19:54:15 +0200 |
| commit | 9afe5210f2a44cacac4f3527b6c8b561d9e4296b (patch) | |
| tree | a83c412966783b123cd3152fe34a6f7cddcb55d6 | |
| parent | f4bf9110727f2c7113c80aaa88427b81605016ae (diff) | |
| parent | 4667bb8e4111abde822ae57993a29929c5cc9aad (diff) | |
Merge remote-tracking branch 'temp/master'
124 files changed, 2318 insertions, 690 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index 2ad22f49c..4fdb53ae7 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -12,6 +12,9 @@ <stockholm/krebs/2configs/buildbot-all.nix> <stockholm/krebs/2configs/gitlab-runner-shackspace.nix> <stockholm/krebs/2configs/binary-cache/nixos.nix> + <stockholm/krebs/2configs/ircd.nix> + <stockholm/krebs/2configs/reaktor-krebs.nix> + <stockholm/krebs/2configs/reaktor-retiolum.nix> ]; krebs.build.host = config.krebs.hosts.hotdog; diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 978bd18e0..d2664ef84 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -27,6 +27,11 @@ initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda3"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; + + kernelModules = [ "kvm-intel" ]; + extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 |