diff --git a/ansible/roles/kanshi/files/kanshi.service b/ansible/roles/kanshi/files/kanshi.service deleted file mode 100644 index 6697c3c..0000000 --- a/ansible/roles/kanshi/files/kanshi.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Dynamic output configuration for Wayland compositors -Documentation=https://github.com/emersion/kanshi -# BindsTo=graphical.target -BindsTo=graphical-session.target - -[Service] -Type=simple -ExecStart=/usr/bin/kanshi - -[Install] -# WantedBy=graphical.target -WantedBy=graphical-session.target diff --git a/ansible/roles/kanshi/tasks/peruser.yaml b/ansible/roles/kanshi/tasks/peruser.yaml index f51d387..89d5822 100644 --- a/ansible/roles/kanshi/tasks/peruser.yaml +++ b/ansible/roles/kanshi/tasks/peruser.yaml @@ -22,6 +22,16 @@ - src: config_kanshi dest: .config/kanshi/config +- name: Configure sway_config_files + copy: + src: "files/sway_config_files/{{ item }}.conf" + dest: "{{ account_homedir.stdout }}/.config/sway/config.d/{{ item }}.conf" + mode: 0600 + owner: "{{ account_name.stdout }}" + group: "{{ group_name.stdout }}" + loop: + - exec_kanshi + - import_tasks: tasks/peruser_freebsd.yaml when: 'os_flavor == "freebsd"' diff --git a/ansible/roles/kanshi/tasks/peruser_freebsd.yaml b/ansible/roles/kanshi/tasks/peruser_freebsd.yaml index e6c7344..e69de29 100644 --- a/ansible/roles/kanshi/tasks/peruser_freebsd.yaml +++ b/ansible/roles/kanshi/tasks/peruser_freebsd.yaml @@ -1,9 +0,0 @@ -- name: Configure dotfiles (conf directory) - copy: - src: "files/sway_config_files/{{ item }}.conf" - dest: "{{ account_homedir.stdout }}/.config/sway/config.d/{{ item }}.conf" - mode: 0600 - owner: "{{ account_name.stdout }}" - group: "{{ group_name.stdout }}" - loop: - - exec_kanshi diff --git a/ansible/roles/kanshi/tasks/peruser_linux.yaml b/ansible/roles/kanshi/tasks/peruser_linux.yaml index d1a38f6..e69de29 100644 --- a/ansible/roles/kanshi/tasks/peruser_linux.yaml +++ b/ansible/roles/kanshi/tasks/peruser_linux.yaml @@ -1,17 +0,0 @@ -- name: Copy files - copy: - src: "files/{{ item.src }}" - dest: "{{ account_homedir.stdout }}/{{ item.dest }}" - mode: 0600 - owner: "{{ account_name.stdout }}" - group: "{{ group_name.stdout }}" - loop: - - src: kanshi.service - dest: .config/systemd/user/kanshi.service - -- name: Enable services - systemd: - name: kanshi.service - daemon_reload: yes - enabled: true - scope: user diff --git a/ansible/roles/network/files/mullvlad_dns_over_tls.conf b/ansible/roles/network/files/mullvad_dns_over_tls.conf similarity index 69% rename from ansible/roles/network/files/mullvlad_dns_over_tls.conf rename to ansible/roles/network/files/mullvad_dns_over_tls.conf index ca6a9b6..45f15bc 100644 --- a/ansible/roles/network/files/mullvlad_dns_over_tls.conf +++ b/ansible/roles/network/files/mullvad_dns_over_tls.conf @@ -1,6 +1,9 @@ [Resolve] -Domains=~. # Use this instead of the per-link DNS servers +# Use this instead of the per-link DNS servers +Domains=~. DNS=194.242.2.2#doh.mullvad.net [2a07:e340::2]#doh.mullvad.net +# Don't use built-in list of fallback DNS servers +FallbackDNS= DNSOverTLS=yes # DNSSEC=allow-downgrade # Validate DNSSEC only if upstream DNS server supports it # DNSSEC=true # Always validate DNSSEC which breaks name resolution for servers that do not support it diff --git a/ansible/roles/network/tasks/linux.yaml b/ansible/roles/network/tasks/linux.yaml index 8c8f3cd..1eeedc9 100644 --- a/ansible/roles/network/tasks/linux.yaml +++ b/ansible/roles/network/tasks/linux.yaml @@ -22,8 +22,8 @@ owner: root group: wheel loop: - - src: mullvlad_dns_over_tls.conf - dest: /etc/systemd/resolved.conf.d/mullvlad_dns_over_tls.conf + - src: mullvad_dns_over_tls.conf + dest: /etc/systemd/resolved.conf.d/mullvad_dns_over_tls.conf - src: main.conf dest: /etc/iwd/main.conf - src: 10-wired.network