From aa41fa685c79f17a735958aa9e3ffcb52133e751 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 16 Jul 2017 21:54:06 +0200
Subject: [PATCH] ma vncserver: use upstream tigervnc again
---
2configs/vncserver.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/2configs/vncserver.nix b/2configs/vncserver.nix
index c56b3e2..3d1d9fe 100644
--- a/2configs/vncserver.nix
+++ b/2configs/vncserver.nix
@@ -3,14 +3,13 @@ with lib;
let
pwfile = (toString <secrets>)+ "/vnc-password"; # create with `vncpasswd`
pwtmp = "/tmp/vnc-password";
- # nixos-unstable tigervnc is currently broken :\
- package = (import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-17.03.tar.gz) {}).pkgs.tigervnc;
user = config.makefu.gui.user;
vnc_port = 5900;
web_port = 6080;
in {
networking.firewall.allowedTCPPorts = [ 80 vnc_port web_port ];
systemd.services = {
+ # TODO: terminal-server without a real gui and virtual display manager
terminal-server = {
description = "VNC Terminal Server";
after = [ "display-manager.service" "graphical.target" ];
@@ -22,7 +21,7 @@ in {
sleep 5
install -m0700 -o ${user} ${pwfile} ${pwtmp}
'';
- ExecStart = "${package}/bin/x0vncserver -display :0 -rfbport ${toString vnc_port} -passwordfile ${pwtmp}";
+ ExecStart = "${pkgs.tigervnc}/bin/x0vncserver -display :0 -rfbport ${toString vnc_port} -passwordfile ${pwtmp}";
PermissionsStartOnly = true;
PrivateTmp = true;
};