merge master

defaults/main.yaml

@@ -13,6 +13,7 @@ kanboard_api_settings: "{{ lookup('file', '~/.kanboard_api_settings.json') }}"
 #  kanboard_api_user: ka
 #  kanboard_api_key: xxx
 home_vdesk_started_and_enabled: false
+home_vdesk_display_number: 47
 
 home_profile: desktop
 

tasks/clean.yaml

@@ -22,3 +22,10 @@
   file:
     path: ~/.xsession.fish
     state: absent
+
+- name: disable and stop vdesk user service at display 16
+  systemd:
+    name: vdesk@:16.service
+    state: stopped
+    enabled: false
+    scope: user

tasks/main.yaml

@@ -28,7 +28,7 @@
 
 - name: enable and start vdesk user service
   systemd:
-    name: vdesk@:16.service
+    name: vdesk@:{{home_vdesk_display_number}}.service
     state: started
     enabled: true
     scope: user

templates/workspaces/workspace.space.fish.j2

@@ -3,7 +3,7 @@
 
 {% if workspaces[workspace].type == "vdesk" %}
 
-xtigervncviewer localhost:{{workspaces[workspace].display|default(16)}} -via {{workspaces[workspace].host}} -PasswordFile ~/.vnc/passwd.{{workspaces[workspace].host}}
+xtigervncviewer localhost:{{workspaces[workspace].display|default(home_vdesk_display_number)}} -via {{workspaces[workspace].host}} -PasswordFile ~/.vnc/passwd.{{workspaces[workspace].host}}
 
 {% elif workspaces[workspace].type == "tmux" %}