summaryrefslogtreecommitdiffstats
path: root/tv/1systems/wu.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-06 22:38:44 +0100
committermakefu <github@syntax-fehler.de>2015-11-06 22:38:44 +0100
commit9a0e67cf65c5a827df7fca7573f47f3a43474df6 (patch)
tree72058c48138b25e5a0397d21d27ea4cb2a6cca2e /tv/1systems/wu.nix
parent736e1426d5a7ec76d0987840552d56c6b4f0248e (diff)
parent4d93a8215f08cbea0bbcb8c668f2bbc9600016da (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems/wu.nix')
-rw-r--r--tv/1systems/wu.nix14
1 files changed, 1 insertions, 13 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index b12e7df93..33292c608 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -15,11 +15,9 @@ with lib;
target-path = "/var/src/nixpkgs";
};
dir.secrets = {
- host = config.krebs.hosts.wu;
path = "/home/tv/secrets/wu";
};
dir.stockholm = {
- host = config.krebs.hosts.wu;
path = "/home/tv/stockholm";
target-path = "/var/src/stockholm";
};
@@ -27,11 +25,11 @@ with lib;
imports = [
../2configs/hw/w110er.nix
- ../2configs/base.nix
#../2configs/consul-client.nix
../2configs/git.nix
../2configs/mail-client.nix
../2configs/xserver
+ ../2configs/z.nix
{
environment.systemPackages = with pkgs; [
@@ -287,16 +285,6 @@ with lib;
onion = {
uid = 6660010;
};
-
- zalora = {
- uid = 1000301;
- extraGroups = [
- "audio"
- # TODO remove vboxusers when hardening is active
- "vboxusers"
- "video"
- ];
- };
};
security.sudo.extraConfig =