diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-01 14:48:57 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-01 14:48:57 +0200 |
| commit | 842bcf117afef193e807da7f8a8b0265dc096e26 (patch) | |
| tree | 6fec9f5538f36df0526b54e235e60f0b07f92afb /makefu | |
| parent | 4bacf702b0112a82eb2a4a21ee41c6f11337e8dc (diff) | |
| parent | d9f4d621bcde5ddc983a922e378657dba1f6e141 (diff) | |
Merge branch 'makefu'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/pnp.nix | 4 | ||||
| -rw-r--r-- | makefu/2configs/virtualization-virtualbox.nix | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 497c03e11..7698ea14d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -32,6 +32,10 @@ ]; krebs.Reaktor.enable = true; krebs.Reaktor.debug = true; + krebs.Reaktor.nickname = "Reaktor|bot"; + krebs.Reaktor.extraEnviron = { + REAKTOR_CHANNELS = "#krebs,#binaergewitter"; + }; krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix index 164401f77..610b63732 100644 --- a/makefu/2configs/virtualization-virtualbox.nix +++ b/makefu/2configs/virtualization-virtualbox.nix @@ -9,7 +9,7 @@ let sha256 = "1ykwpjvfgj11iwhx70bh2hbxhyy3hg6rnqzl4qac7xzg8xw8wqg4"; }; in { - inherit vboxguestpkg; + #inherit vboxguestpkg; virtualisation.virtualbox.host.enable = true; nixpkgs.config.virtualbox.enableExtensionPack = true; |