1 files changed, 11 insertions, 28 deletions
diff --git a/roles/obs/tasks/tigervnc.yml b/roles/obs/tasks/tigervnc.yml
index 539b70e..e895bec 100644
--- a/roles/obs/tasks/tigervnc.yml
+++ b/roles/obs/tasks/tigervnc.yml
@@ -1,36 +1,27 @@
-- name: Add packages
-  apt:
-    name:
-      - tigervnc-standalone-server
-      - tigervnc-common
 - name: Create VNC dirs
   file:
-    path: /home/{{ emacsconf_user }}/.vnc
+    path: ~{{ emacsconf_user }}/.vnc
     state: directory
-    mode: 0755
     owner: "{{ emacsconf_user }}"
+    group: "{{ emacsconf_group }}"
+    mode: 0755
 # https://github.com/sdarwin/Ansible-VNC/blob/master/tasks/main.yml
 - name: Set VNC password
-  become: "{{ emacsconf_user }}"
   shell: |
     set -o pipefail
-    printf "{{ vnc_password }}\n{{ vnc_password }}\n\n" | vncpasswd /home/{{ emacsconf_user }}/.vnc/passwd
+    printf "{{ vnc_password }}\n{{ vnc_password }}\n\n" | vncpasswd ~{{ emacsconf_user }}/.vnc/passwd
   args:
-    chdir: "/home/{{ emacsconf_user }}/.vnc"
-    creates: "/home/{{ emacsconf_user }}/.vnc/passwd"
+    chdir: "~{{ emacsconf_user }}/.vnc"
+    creates: "~{{ emacsconf_user }}/.vnc/passwd"
     executable: /bin/bash
-- name: Set up xstartup
-  template:
-    src: xstartup
-    dest: ~{{ emacsconf_user }}/.vnc/xstartup
-    mode: 0700
 - name: Set up xstartup for the tracks
   template:
     src: xstartup-track
-    dest: ~{{ emacsconf_user }}/.vnc/xstartup-{{ item.id }}
+    dest: ~{{ emacsconf_user }}/.vnc/xstartup
+    owner: "{{ emacsconf_user }}"
+    group: "{{ emacsconf_group }}"
     mode: 0700
-  loop: "{{ emacsconf_tracks }}"
-- name: Set up xstartup
+- name: Set up xresources
   template:
     src: xresources
     dest: ~{{ emacsconf_user }}/.Xresources
@@ -40,15 +31,7 @@
 - name: Set up VNC scripts
   template:
     src: vnc-track
-    dest: "{{ emacsconf_home }}/bin/{{ item.id }}/-vnc"
+    dest: "~{{ emacsconf_user }}/bin/track-vnc"
     mode: 0755
     owner: "{{ emacsconf_user }}"
     group: "{{ emacsconf_group }}"
-  loop: "{{ emacsconf_tracks }}"
-- name: Set permissions and ownership
-  file:
-    path: "/home/{{ emacsconf_user }}/.vnc"
-    owner: "{{ emacsconf_user }}"
-    group: "{{ emacsconf_group }}"
-    mode: "u+rwX,g-rwx,o-rwx"
-    recurse: t