summaryrefslogtreecommitdiffstats
path: root/tv/1systems/xu.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
committerlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
commit0b0b0d65ee05583529df831985580e392713d29a (patch)
tree7eb6799a996924d8e895c54633a47ea3d7a92a4c /tv/1systems/xu.nix
parent3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff)
parentb7a92f63884af00eb0243ec9328be689a6c9b845 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems/xu.nix')
-rw-r--r--tv/1systems/xu.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 8c4af2bd3..5ec1fe52b 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.build.host = config.krebs.hosts.xu;
imports = [
+ ../.
../2configs/hw/x220.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
@@ -14,6 +15,7 @@ with lib;
../2configs/pulse.nix
../2configs/retiolum.nix
../2configs/xserver
+ ../2configs/xu-qemu0.nix
{
environment.systemPackages = with pkgs; [
@@ -43,7 +45,7 @@ with lib;
# tv
bc
bind # dig
- #cac
+ cac-api
dic
file
gnupg21
@@ -189,8 +191,6 @@ with lib;
"d /tmp 1777 root root - -" # does this work with mounted /tmp?
];
- #virtualisation.libvirtd.enable = true;
-
#services.bitlbee.enable = true;
#services.tor.client.enable = true;
#services.tor.enable = true;