diff options
| author | lassulus <lassulus@lassul.us> | 2020-08-06 23:24:29 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-08-06 23:24:29 +0200 |
| commit | e0e91cfd74c9ce5d3f9ce9c2e2efab322a00f960 (patch) | |
| tree | f17565a1d7bc496b0b439ff45010f3f9c91c6d4f /tv/3modules/x0vncserver.nix | |
| parent | 04d9ff2dcdc039518391fcb41ffbb256e2f4ba23 (diff) | |
| parent | 42df7da046f46efaca0cb0243a6de3aff599c8aa (diff) | |
Merge remote-tracking branch 'ni/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}" |