summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-24 11:14:54 +0100
committerlassulus <lass@aidsballs.de>2015-12-24 11:14:54 +0100
commitd7741ca83f8c3ebe8a283c3231a9bf17bf05d94c (patch)
treecc4a5ab6e1284d9a32fab80b4ecab6a5834208a0 /tv
parent57feffb3f65876cca3f10ef82e6e82283c02852d (diff)
parent6e4351044195f1f3b5708785e760b9d118e2c229 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/wu.nix7
-rw-r--r--tv/2configs/git.nix3
2 files changed, 9 insertions, 1 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index cd3139754..a768e781b 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -234,7 +234,12 @@ with lib;
KERNEL=="hpet", GROUP="audio"
'';
- services.bitlbee.enable = true;
+ services.bitlbee = {
+ enable = true;
+ plugins = [
+ pkgs.bitlbee-facebook
+ ];
+ };
services.tor.client.enable = true;
services.tor.enable = true;
services.virtualboxHost.enable = true;
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 4387be36a..800deff1b 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -33,6 +33,9 @@ let
nixpkgs = {};
push = {};
regfish = {};
+ soundcloud = {
+ desc = "SoundCloud command line interface";
+ };
stockholm = {
desc = "take all the computers hostage, they'll love you!";
};