summaryrefslogtreecommitdiffstats
path: root/lass/2configs/baseX.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-05-24 01:31:22 +0200
committertv <tv@krebsco.de>2017-05-24 01:31:22 +0200
commit46d6506916f699e3b707dc41cd68c92b98e50e5a (patch)
tree1d43d0072fc479c7022e3cd3b9810aa7b90e1db3 /lass/2configs/baseX.nix
parent061e702a6fc0e6046d39c3975c9034a69499c45f (diff)
parent90f6d9f228029233d38a86a520a0e532cc5e499f (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r--lass/2configs/baseX.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9c51effdc..3e2e325d8 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -10,6 +10,7 @@ in {
./copyq.nix
./xresources.nix
./livestream.nix
+ ./dns-stuff.nix
{
hardware.pulseaudio = {
enable = true;
@@ -33,6 +34,7 @@ in {
time.timeZone = "Europe/Berlin";
programs.ssh.startAgent = false;
+ services.openssh.forwardX11 = true;
services.printing = {
enable = true;
[cgit] Unable to lock slot /tmp/cgit/bd000000.lock: No such file or directory (2)