Procházet zdrojové kódy

Merge branch 'master' of git.thengo.net:ka/ansible-role-home

master
rodič
revize
badc177242
7 změnil soubory, kde provedl 37 přidání a 11 odebrání
  1. +8
    -2
      tasks/i3.yaml
  2. +1
    -1
      tasks/vnc.yaml
  3. +4
    -0
      templates/i3/i3.config.j2
  4. +13
    -0
      templates/i3/i3wm@.service.j2
  5. +5
    -5
      templates/vnc/vncserver@.service.j2
  6. +3
    -0
      templates/x11/xsession.reload.fish.j2
  7. +3
    -3
      vars/main.yaml

+ 8
- 2
tasks/i3.yaml Zobrazit soubor

@@ -36,14 +36,20 @@
dest: ~/.config/i3blocks/config
notify: i3 reload

- name: i3wm graphical-session service
- name: i3wm graphical-session service for the default xsession
template:
src: i3/i3wm.service.j2
dest: ~/.config/systemd/user/i3wm.service
notify: systemd daemon-reload

- name: i3wm graphical-session service for specific displays
template:
src: i3/i3wm@.service.j2
dest: ~/.config/systemd/user/i3wm@.service
notify: systemd daemon-reload

- name: i3wm graphical-session service enabled
systemd:
name: i3wm.service
name: i3wm@.service
enabled: true
scope: user

+ 1
- 1
tasks/vnc.yaml Zobrazit soubor

@@ -14,6 +14,6 @@

- name: vncserver user service
template:
src: vnc/vncserver.service.j2
src: vnc/vncserver@.service.j2
dest: ~/.config/systemd/user/vncserver@.service
notify: systemd daemon-reload

+ 4
- 0
templates/i3/i3.config.j2 Zobrazit soubor

@@ -352,6 +352,7 @@ for_window [class="^Pavu"] floating enable
for_window [class="^Paman$"] floating enable
for_window [class="^Blueman"] floating enable
for_window [class="^URxvt$" title="^tmux-workspace$"] border none
for_window [class="^zoom$" title="^zoom$"] floating enable

### assign apps to workspaces
assign [class="^netzdrive$"] → netzdrive
@@ -359,6 +360,9 @@ assign [class="^TelegramDesktop$"] → tg
assign [class="^Signal$"] → signal
assign [class="^Element$"] → matrix
assign [class="^thunderbird$"] → mail
assign [class="^zoom$" ] → zoom
assign [class="^Wfica_"] → citrix
assign [title="^Citrix maximized probe window$"] → citrix
# vncviewer workspaces
{% for workspace in workspaces|dict2items|json_query("[?value.type=='vncviewer'].key") %}
{% set ws = workspaces[workspace] %}


+ 13
- 0
templates/i3/i3wm@.service.j2 Zobrazit soubor

@@ -0,0 +1,13 @@
[Unit]
Description=i3 Window Manager for Display %i
After=vncserver@%i.service

[Service]
Environment=DISPLAY=%i
Environment=XAUTHORITY=%h/.Xauthority%i
Type=exec
ExecStart=i3
ExecReload=i3-msg reload

[Install]
WantedBy=default.target

templates/vnc/vncserver.service.j2 → templates/vnc/vncserver@.service.j2 Zobrazit soubor

@@ -21,14 +21,14 @@ After=syslog.target network.target
[Service]
WorkingDirectory=%h
Environment=DISPLAY=%i
Environment=XAUTHORITY=%h/.Xauthority
Environment=XAUTHORITY=%h/.Xauthority%i
ExecStart=Xtigervnc $DISPLAY {{vncserver_options|replace('\n',' ')|trim}}
ExecStartPost=fish -c "while not xdpyinfo > /dev/null 2> /dev/null; sleep 0.1; end"
ExecStartPost=xrandr --output VNC-0 --primary
ExecStartPost=systemctl --user import-environment DISPLAY XAUTHORITY
ExecStartPost=fish -c "set -x XDG_SESSION_TYPE x11; systemctl --user import-environment XDG_SESSION_TYPE"
ExecStartPost=systemctl --user restart dbus.service
ExecStartPost=systemctl --user start xsession.target
#ExecStartPost=systemctl --user import-environment DISPLAY XAUTHORITY
#ExecStartPost=fish -c "set -x XDG_SESSION_TYPE x11; systemctl --user import-environment XDG_SESSION_TYPE"
#ExecStartPost=systemctl --user restart dbus.service
#ExecStartPost=systemctl --user start xsession.target

[Install]
WantedBy=default.target

+ 3
- 0
templates/x11/xsession.reload.fish.j2 Zobrazit soubor

@@ -37,3 +37,6 @@ xset dpms {{ display_sleeptime | int }} {{ display_sleeptime | int }} {{ display
{% for xhost in home_xhosts_allow %}
xhost +{{xhost}}
{% endfor %}

# disable bell
xset b off

+ 3
- 3
vars/main.yaml Zobrazit soubor

@@ -1,4 +1,4 @@
i3_exec_command_prefix: systemd-run --user --scope --no-block #--slice-inherit
i3_exec_command_prefix: systemd-run --user --scope --no-block -E DISPLAY=$DISPLAY -E XDG_SESSION_TYPE=x11 #--slice-inherit

home_autostart_desktop_apps:
- name: terminal
@@ -138,11 +138,11 @@ todo_i3block_socket: "{{todo_folder}}/i3block.sock"

vncserver_options: |
-desktop %H%i
-auth %h/.Xauthority
-auth %h/.Xauthority%i
-geometry {{home_vncserver_geometry}}
-depth 24
-rfbwait 30000
-rfbunixpath %h/.vnc/socket
-rfbunixpath %h/.vnc/socket%i
-nolisten tcp
-pn
-localhost