merge master

tasks/clean.yaml

@@ -29,3 +29,16 @@
     state: stopped
     enabled: false
     scope: user
+
+- name: disable and stop vdesk user service at display 47
+  systemd:
+    name: vdesk@:47.service
+    state: stopped
+    enabled: false
+    scope: user
+
+- name: remove vdesk user service
+  file:
+    path: ~/.config/systemd/user/vdesk@.service
+    state: absent
+  notify: systemd daemon-reload

tasks/main.yaml

@@ -4,7 +4,6 @@
 
 - import_tasks: structure.yaml
 - import_tasks: ssh.yaml
-- import_tasks: vnc.yaml
 - import_tasks: tmux.yaml
 - import_tasks: pulseaudio.yaml
 - import_tasks: screensaver.yaml
@@ -20,15 +19,15 @@
     - import_tasks: background.yaml
     - import_tasks: rofi.yaml
     - import_tasks: x11.yaml
-    - import_tasks: vdesk.yaml
+    - import_tasks: vnc.yaml
   when: home_desktop
 
 - name: flush handlers
   meta: flush_handlers
 
-- name: enable and start vdesk user service
+- name: enable and start vncserver user service
   systemd:
-    name: vdesk@:{{home_vdesk_display_number}}.service
+    name: vncserver@:{{home_vdesk_display_number}}.service
     state: started
     enabled: true
     scope: user

tasks/vdesk.yaml

@@ -1,7 +0,0 @@
----
-
-- name: vdesk user service
-  template:
-    src: vdesk/vdesk.service.j2
-    dest: ~/.config/systemd/user/vdesk@.service
-  notify: systemd daemon-reload

tasks/vnc.yaml

@@ -30,3 +30,15 @@
     src: vnc/default.tigervnc.j2
     dest: ~/.vnc/default.tigervnc
     mode: 0755
+
+- name: vncserver user service
+  template:
+    src: vnc/vncserver.service.j2
+    dest: ~/.config/systemd/user/vncserver@.service
+  notify: systemd daemon-reload
+
+- name: Xvnc-session script
+  template:
+    src: x11/xsessionrc.j2
+    dest: ~/.vnc/Xvnc-session
+    mode: 0755

tasks/x11.yaml

@@ -35,7 +35,7 @@
     dest: ~/.config/systemd/user/xsession.target
   notify: systemd daemon-reload
 
-- name: xsessionrc
+- name: xsessionrc script
   template:
     src: x11/xsessionrc.j2
     dest: ~/.xsessionrc

templates/vdesk/vdesk.service.j2 → templates/vnc/vncserver.service.j2

@@ -21,7 +21,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
-ExecStart=/usr/bin/fish -c "/usr/bin/vncserver -xstartup ~/.xsession.fish %i"
+ExecStart=/usr/bin/fish -c "/usr/bin/vncserver %i"
 ExecStop=/usr/bin/vncserver -kill %i
 
 [Install]