fix: thunar requires xfce helpers to find terminal

This commit is contained in:
Ben Grande 2024-01-31 14:42:17 +01:00
parent c08b39decc
commit b5d7371f93
13 changed files with 68 additions and 4 deletions

View File

@ -24,7 +24,7 @@ Firefox-ESR, W3M or Lynx.
- Top - Top
```sh ```sh
qubesctl top.enable browser qubesctl top.enable browser
qubesctl --targets=tpl-browser state.apply qubesctl --targets=tpl-browser,dvm-browser state.apply
qubesctl top.disable browser qubesctl top.disable browser
qubesctl state.apply browser.appmenus qubesctl state.apply browser.appmenus
``` ```
@ -34,6 +34,7 @@ qubesctl state.apply browser.appmenus
```sh ```sh
qubesctl state.apply browser.create qubesctl state.apply browser.create
qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install
qubesctl --skip-dom0 --targets=dvm-browser state.apply browser.configure
qubesctl state.apply browser.appmenus qubesctl state.apply browser.appmenus
``` ```
<!-- pkg:end:post-install --> <!-- pkg:end:post-install -->

View File

@ -0,0 +1,14 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
include:
- dotfiles.copy-sh
- dotfiles.copy-x11
- dotfiles.copy-xfce
{% endif -%}

View File

@ -0,0 +1,10 @@
{#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'dom0':
- match: nodegroup
- browser.configure

View File

@ -10,3 +10,5 @@ base:
- browser.create - browser.create
'tpl-browser': 'tpl-browser':
- browser.install - browser.install
'dvm-browser':
- browser.configure

@ -1 +1 @@
Subproject commit 165dd238d622c209de6d7fabb8b46130d9997902 Subproject commit 5634910c978c0933077e5369094444ae6ff2a837

View File

@ -21,7 +21,7 @@ necessary packages will be installed in the template.
- Top: - Top:
```sh ```sh
qubesctl top.enable reader qubesctl top.enable reader
qubesctl --targets=tpl-reader state.apply qubesctl --targets=tpl-reader,dvm-reader state.apply
qubesctl top.disable reader qubesctl top.disable reader
qubesctl state.apply reader.appmenus qubesctl state.apply reader.appmenus
``` ```
@ -31,6 +31,7 @@ qubesctl state.apply reader.appmenus
```sh ```sh
qubesctl state.apply reader.create qubesctl state.apply reader.create
qubesctl --skip-dom0 --targets=tpl-reader state.apply reader.install qubesctl --skip-dom0 --targets=tpl-reader state.apply reader.install
qubesctl --skip-dom0 --targets=dvm-reader state.apply reader.configure
qubesctl state.apply reader.appmenus qubesctl state.apply reader.appmenus
``` ```
<!-- pkg:end:post-install --> <!-- pkg:end:post-install -->

14
salt/reader/configure.sls Normal file
View File

@ -0,0 +1,14 @@
{#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
include:
- dotfiles.copy-sh
- dotfiles.copy-x11
- dotfiles.copy-xfce
{% endif -%}

10
salt/reader/configure.top Normal file
View File

@ -0,0 +1,10 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'dom0':
- match: nodegroup
- reader.configure

View File

@ -10,3 +10,5 @@ base:
- reader.create - reader.create
'tpl-reader': 'tpl-reader':
- reader.install - reader.install
'dvm-reader':
- reader.configure

View File

@ -8,6 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-xfce
"{{ slsdotpath }}-desktop-autostart": "{{ slsdotpath }}-desktop-autostart":
file.symlink: file.symlink:

View File

@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
include:
- browser.configure
"{{ slsdotpath }}-browser-rc.local": "{{ slsdotpath }}-browser-rc.local":
file.managed: file.managed:
- name: /rw/config/rc.local.d/50-sys-cacher.rc - name: /rw/config/rc.local.d/50-sys-cacher.rc

View File

@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
include:
- browser.configure
"{{ slsdotpath }}-browser-rc.local": "{{ slsdotpath }}-browser-rc.local":
file.managed: file.managed:
- name: /rw/config/rc.local.d/50-sys-syncthing.rc - name: /rw/config/rc.local.d/50-sys-syncthing.rc

View File

@ -1,10 +1,13 @@
{# {#
SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
include:
- dotfiles.copy-xfce
"{{ slsdotpath }}-rc.local": "{{ slsdotpath }}-rc.local":
file.managed: file.managed:
- name: /rw/config/rc.local.d/50-sys-syncthing.rc - name: /rw/config/rc.local.d/50-sys-syncthing.rc