@@ -12,8 +12,9 @@ kanboard_api_settings: "{{ lookup('file', '~/.kanboard_api_settings.json') }}" | |||||
# kanboard_api_url: https://kanboard.katyx.net/jsonrpc.php | # kanboard_api_url: https://kanboard.katyx.net/jsonrpc.php | ||||
# kanboard_api_user: ka | # kanboard_api_user: ka | ||||
# kanboard_api_key: xxx | # kanboard_api_key: xxx | ||||
home_vdesk_started_and_enabled: false | |||||
home_vdesk_display_number: 47 | |||||
home_vncserver_started_and_enabled: "{{ home_profile == 'vdesk' }}" | |||||
home_vncserver_display_number: 47 | |||||
home_xsession_vncviewer: "{{ home_profile == 'vdesk' }}" | |||||
home_profile: desktop | home_profile: desktop | ||||
@@ -10,6 +10,11 @@ | |||||
src: i3/i3.config.j2 | src: i3/i3.config.j2 | ||||
dest: ~/.config/i3/config | dest: ~/.config/i3/config | ||||
- name: i3 null config | |||||
template: | |||||
src: i3/i3.null.config.j2 | |||||
dest: ~/.config/i3/null.config | |||||
- name: check i3 config | - name: check i3 config | ||||
command: i3 -c ~/.config/i3/config -C | command: i3 -c ~/.config/i3/config -C | ||||
changed_when: false | changed_when: false | ||||
@@ -28,8 +28,8 @@ | |||||
- name: enable and start vncserver user service | - name: enable and start vncserver user service | ||||
systemd: | systemd: | ||||
name: vncserver@:{{home_vdesk_display_number}}.service | |||||
name: vncserver@:{{home_vncserver_display_number}}.service | |||||
state: started | state: started | ||||
enabled: true | enabled: true | ||||
scope: user | scope: user | ||||
when: home_vdesk_started_and_enabled | |||||
when: home_vncserver_started_and_enabled |
@@ -45,6 +45,6 @@ | |||||
- name: vnc xsession script | - name: vnc xsession script | ||||
template: | template: | ||||
src: x11/xsession.j2 | |||||
src: vnc/xsession.j2 | |||||
dest: ~/.vnc/xsession | dest: ~/.vnc/xsession | ||||
mode: 0755 | mode: 0755 |
@@ -0,0 +1,15 @@ | |||||
{{ ansible_managed | comment }} | |||||
# i3 config file (v4) | |||||
# | |||||
# Please see http://i3wm.org/docs/userguide.html for a complete reference! | |||||
font pango:monospace 10 | |||||
bar { | |||||
mode invisible | |||||
} | |||||
default_border none | |||||
hide_edge_borders both | |||||
workspace_layout tabbed |
@@ -20,7 +20,6 @@ After=syslog.target network.target | |||||
[Service] | [Service] | ||||
Type=forking | Type=forking | ||||
ExecStartPre=/usr/bin/vncserver -kill %i | |||||
ExecStart=/usr/bin/vncserver %i | ExecStart=/usr/bin/vncserver %i | ||||
ExecStop=/usr/bin/vncserver -kill %i | ExecStop=/usr/bin/vncserver -kill %i | ||||
@@ -0,0 +1,5 @@ | |||||
#!/bin/sh | |||||
{{ansible_managed|comment}} | |||||
exec systemctl --user start --wait xsession.target |
@@ -3,7 +3,7 @@ | |||||
{% if workspaces[workspace].type == "vdesk" %} | {% if workspaces[workspace].type == "vdesk" %} | ||||
xtigervncviewer localhost:{{workspaces[workspace].display|default(home_vdesk_display_number)}} -via {{workspaces[workspace].host}} -PasswordFile ~/.vnc/passwd.{{workspaces[workspace].host}} | |||||
xtigervncviewer localhost:{{workspaces[workspace].display|default(home_vncserver_display_number)}} -via {{workspaces[workspace].host}} -PasswordFile ~/.vnc/passwd.{{workspaces[workspace].host}} | |||||
{% elif workspaces[workspace].type == "tmux" %} | {% elif workspaces[workspace].type == "tmux" %} | ||||
@@ -2,4 +2,10 @@ | |||||
{{ansible_managed|comment}} | {{ansible_managed|comment}} | ||||
{% if not home_xsession_vncviewer %} | |||||
exec systemctl --user start --wait xsession.target | exec systemctl --user start --wait xsession.target | ||||
{% else %} | |||||
systemctl --user start vncserver@:{{home_vncserver_display_number}}.service | |||||
i3 -c ~/.config/i3/null.config & | |||||
exec xtigervncviewer localhost:{{home_vncserver_display_number}} -PasswordFile ~/.vnc/passwd -FullScreen=1 -Maximize=1 | |||||
{% endif %} |