diff options
| author | lassulus <lass@aidsballs.de> | 2015-09-05 12:17:59 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-09-05 12:17:59 +0200 |
| commit | f54a0a9ea7fd5a9902a5b38786da42f06d615b5a (patch) | |
| tree | d7c475b212d8acc35a5dc7d20ec1f2228c664010 /makefu/1systems/pnp.nix | |
| parent | f3c1727659c59ff638b1adead8e30ee2f79f39de (diff) | |
| parent | d6d9956abc60548c755d30e6a5bd13c10abbb181 (diff) | |
Merge branch 'makefu'
Diffstat (limited to 'makefu/1systems/pnp.nix')
| -rw-r--r-- | makefu/1systems/pnp.nix | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 963d07744..98f3ecd22 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -7,24 +7,38 @@ { imports = [ # Include the results of the hardware scan. - <nixpkgs/nixos/modules/profiles/qemu-guest.nix> + # Base ../2configs/base.nix - ../2configs/cgit-retiolum.nix - # ../2configs/graphite-standalone.nix - ../2configs/vm-single-partition.nix ../2configs/tinc-basic-retiolum.nix + # HW/FS + <nixpkgs/nixos/modules/profiles/qemu-guest.nix> + ../2configs/fs/vm-single-partition.nix + + # Services + ../2configs/git/cgit-retiolum.nix + + ## Reaktor + ## \/ are only plugins, must enable Reaktor explicitly + ../2configs/Reaktor/stockholmLentil.nix + ../2configs/Reaktor/simpleExtend.nix + ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix + + # ../2configs/graphite-standalone.nix ]; + krebs.Reaktor.enable = true; + krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pnp"; + krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; + rev = "03921972268934d900cc32dad253ff383926771c"; }; }; |