summaryrefslogtreecommitdiffstats
path: root/tv/1systems/xu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-01-16 11:43:10 +0100
committermakefu <github@syntax-fehler.de>2019-01-16 11:43:10 +0100
commite3851e0c69490d19351e0bcef64c23c9070d1d19 (patch)
treea3d1de2957f7c7c2502a399614264852c652cf49 /tv/1systems/xu
parent33655bfd89f7ea6f8ab3e3139cd79f4c2d2a0ef6 (diff)
parent6cef97deb3a96731a4737f05513e2e5855f60685 (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv/1systems/xu')
-rw-r--r--tv/1systems/xu/config.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index b9c76cf49..33f9539c9 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -20,6 +20,7 @@ with import <stockholm/lib>;
<stockholm/tv/2configs/br.nix>
<stockholm/tv/2configs/xp-332.nix>
<stockholm/tv/2configs/xserver>
+ <stockholm/tv/2configs/xserver/xkiller.nix>
{
environment.systemPackages = with pkgs; [
@@ -156,10 +157,5 @@ with import <stockholm/lib>;
# The NixOS release to be compatible with for stateful data such as databases.
system.stateVersion = "15.09";
- tv.nixpkgs-overlays = {
- krebs = "/home/tv/stockholm/krebs/5pkgs";
- tv = "/home/tv/stockholm/tv/5pkgs";
- };
-
virtualisation.virtualbox.host.enable = true;
}