summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-11-07 19:24:46 +0100
committertv <tv@shackspace.de>2015-11-07 19:24:46 +0100
commita1c3f26b040ee1919c24491f4f3cb3a6e895fbce (patch)
tree5008ffe89bf2b2c7a7bf0e0c45ca984f9753dec4 /tv/1systems
parentbbcdef021a9197ff4b6ae597600b649b9a7b998b (diff)
parente35e3b5eb05cea1e3c033423c2f6ee4e0a511817 (diff)
Merge remote-tracking branch 'nomic/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/wu.nix11
-rw-r--r--tv/1systems/xu.nix12
2 files changed, 7 insertions, 16 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index ee529f3dc..2c0098c1c 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -12,6 +12,7 @@ with lib;
../2configs/mail-client.nix
../2configs/xserver
../2configs/z.nix
+ ../2configs/sub/xr.nix
{
environment.systemPackages = with pkgs; [
@@ -120,6 +121,8 @@ with lib;
#xkill
#xl2tpd
#xsel
+
+ unison
];
}
{
@@ -234,14 +237,6 @@ with lib;
];
};
- xr = {
- uid = 13370061;
- extraGroups = [
- "audio"
- "video"
- ];
- };
-
"23" = {
uid = 13370023;
};
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 32688aaed..57f318ad0 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -5,6 +5,9 @@ with lib;
{
krebs.build.host = config.krebs.hosts.xu;
+ krebs.build.source.git.nixpkgs.rev =
+ "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
+
imports = [
../2configs/hw/x220.nix
#../2configs/consul-client.nix
@@ -12,6 +15,7 @@ with lib;
../2configs/mail-client.nix
../2configs/xserver
../2configs/z.nix
+ ../2configs/sub/xr.nix
{
environment.systemPackages = with pkgs; [
@@ -236,14 +240,6 @@ with lib;
];
};
- xr = {
- uid = 13370061;
- extraGroups = [
- "audio"
- "video"
- ];
- };
-
"23" = {
uid = 13370023;
};