diff options
| author | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
| commit | 4cb0ff12ba563693b6be7aac3c7cc8c6ce7a003c (patch) | |
| tree | 2eceb32d72c1799938bce57240566ba576c2c3b4 /tv/3modules/x0vncserver.nix | |
| parent | 93606315b99a2540c5859d93eb2377ae32fa6506 (diff) | |
| parent | f556a302f62434e0a47ef23db7e569bdb9c489f6 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/3modules/x0vncserver.nix')
| -rw-r--r-- | tv/3modules/x0vncserver.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tv/3modules/x0vncserver.nix b/tv/3modules/x0vncserver.nix index 44fed590d..ba79c4a49 100644 --- a/tv/3modules/x0vncserver.nix +++ b/tv/3modules/x0vncserver.nix @@ -12,6 +12,7 @@ in { enable = mkEnableOption "tv.x0vncserver"; pwfile = mkOption { default = { + name = "x0vncserver-pwfile"; owner = cfg.user; path = "${cfg.user.home}/.vncpasswd"; source-path = toString <secrets> + "/vncpasswd"; @@ -36,8 +37,16 @@ in { x0vncserver-pwfile = cfg.pwfile; }; systemd.services.x0vncserver = { - after = [ "graphical.target" "secret.service" ]; - requires = [ "graphical.target" "secret.service" ]; + after = [ + config.krebs.secret.files.x0vncserver-pwfile.service + "graphical.target" + ]; + partOf = [ + config.krebs.secret.files.x0vncserver-pwfile.service + ]; + requires = [ + "graphical.target" + ]; serviceConfig = { ExecStart = "${pkgs.tigervnc}/bin/x0vncserver ${toString [ "-display ${cfg.display}" |