summaryrefslogtreecommitdiffstats
path: root/tv/3modules/default.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-12-04 19:27:27 +0100
committerjeschli <jeschli@gmail.com>2018-12-04 19:27:27 +0100
commit8ecc3901fd8bbd6172e6c32325aa3bc566c388de (patch)
tree781f0a5fd3c27ba99072b75735981071db2cef5b /tv/3modules/default.nix
parentebe6108a41748ae3f746ea3125216668542bcd4b (diff)
parent006364274f516eb41def5f711c23b19e0b0a41f8 (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'tv/3modules/default.nix')
-rw-r--r--tv/3modules/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index 493cc8b..f53a58e 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -1,10 +1,12 @@
{
imports = [
./charybdis
+ ./dnsmasq.nix
./ejabberd
./hosts.nix
./iptables.nix
./nixpkgs-overlays.nix
+ ./slock.nix
./x0vncserver.nix
];
}