From b5d7371f93de06e38199cf2022076208345b8f9f Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Wed, 31 Jan 2024 14:42:17 +0100 Subject: [PATCH] fix: thunar requires xfce helpers to find terminal --- salt/browser/README.md | 3 ++- salt/browser/configure.sls | 14 ++++++++++++++ salt/browser/configure.top | 10 ++++++++++ salt/browser/init.top | 2 ++ salt/dotfiles | 2 +- salt/reader/README.md | 3 ++- salt/reader/configure.sls | 14 ++++++++++++++ salt/reader/configure.top | 10 ++++++++++ salt/reader/init.top | 2 ++ salt/signal/configure.sls | 1 + salt/sys-cacher/configure-browser.sls | 3 +++ salt/sys-syncthing/configure-browser.sls | 3 +++ salt/sys-syncthing/configure.sls | 5 ++++- 13 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 salt/browser/configure.sls create mode 100644 salt/browser/configure.top create mode 100644 salt/reader/configure.sls create mode 100644 salt/reader/configure.top diff --git a/salt/browser/README.md b/salt/browser/README.md index e7a603a..4eeda43 100644 --- a/salt/browser/README.md +++ b/salt/browser/README.md @@ -24,7 +24,7 @@ Firefox-ESR, W3M or Lynx. - Top ```sh qubesctl top.enable browser -qubesctl --targets=tpl-browser state.apply +qubesctl --targets=tpl-browser,dvm-browser state.apply qubesctl top.disable browser qubesctl state.apply browser.appmenus ``` @@ -34,6 +34,7 @@ qubesctl state.apply browser.appmenus ```sh qubesctl state.apply browser.create 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 ``` diff --git a/salt/browser/configure.sls b/salt/browser/configure.sls new file mode 100644 index 0000000..01e8b77 --- /dev/null +++ b/salt/browser/configure.sls @@ -0,0 +1,14 @@ +{# +SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. + +SPDX-License-Identifier: AGPL-3.0-or-later +#} + +{% if grains['nodename'] != 'dom0' -%} + +include: + - dotfiles.copy-sh + - dotfiles.copy-x11 + - dotfiles.copy-xfce + +{% endif -%} diff --git a/salt/browser/configure.top b/salt/browser/configure.top new file mode 100644 index 0000000..6c55f35 --- /dev/null +++ b/salt/browser/configure.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. + +SPDX-License-Identifier: AGPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - browser.configure diff --git a/salt/browser/init.top b/salt/browser/init.top index 6c8951e..8e35a59 100644 --- a/salt/browser/init.top +++ b/salt/browser/init.top @@ -10,3 +10,5 @@ base: - browser.create 'tpl-browser': - browser.install + 'dvm-browser': + - browser.configure diff --git a/salt/dotfiles b/salt/dotfiles index 165dd23..5634910 160000 --- a/salt/dotfiles +++ b/salt/dotfiles @@ -1 +1 @@ -Subproject commit 165dd238d622c209de6d7fabb8b46130d9997902 +Subproject commit 5634910c978c0933077e5369094444ae6ff2a837 diff --git a/salt/reader/README.md b/salt/reader/README.md index d248ac5..c800fad 100644 --- a/salt/reader/README.md +++ b/salt/reader/README.md @@ -21,7 +21,7 @@ necessary packages will be installed in the template. - Top: ```sh qubesctl top.enable reader -qubesctl --targets=tpl-reader state.apply +qubesctl --targets=tpl-reader,dvm-reader state.apply qubesctl top.disable reader qubesctl state.apply reader.appmenus ``` @@ -31,6 +31,7 @@ qubesctl state.apply reader.appmenus ```sh qubesctl state.apply reader.create 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 ``` diff --git a/salt/reader/configure.sls b/salt/reader/configure.sls new file mode 100644 index 0000000..7237beb --- /dev/null +++ b/salt/reader/configure.sls @@ -0,0 +1,14 @@ +{# +SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. + +SPDX-License-Identifier: AGPL-3.0-or-later +#} + +{% if grains['nodename'] != 'dom0' -%} + +include: + - dotfiles.copy-sh + - dotfiles.copy-x11 + - dotfiles.copy-xfce + +{% endif -%} diff --git a/salt/reader/configure.top b/salt/reader/configure.top new file mode 100644 index 0000000..e152a5b --- /dev/null +++ b/salt/reader/configure.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. + +SPDX-License-Identifier: AGPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - reader.configure diff --git a/salt/reader/init.top b/salt/reader/init.top index 433d3e1..cc92632 100644 --- a/salt/reader/init.top +++ b/salt/reader/init.top @@ -10,3 +10,5 @@ base: - reader.create 'tpl-reader': - reader.install + 'dvm-reader': + - reader.configure diff --git a/salt/signal/configure.sls b/salt/signal/configure.sls index 15af08e..3a6657f 100644 --- a/salt/signal/configure.sls +++ b/salt/signal/configure.sls @@ -8,6 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - dotfiles.copy-x11 + - dotfiles.copy-xfce "{{ slsdotpath }}-desktop-autostart": file.symlink: diff --git a/salt/sys-cacher/configure-browser.sls b/salt/sys-cacher/configure-browser.sls index 35701a2..f380784 100644 --- a/salt/sys-cacher/configure-browser.sls +++ b/salt/sys-cacher/configure-browser.sls @@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' %} +include: + - browser.configure + "{{ slsdotpath }}-browser-rc.local": file.managed: - name: /rw/config/rc.local.d/50-sys-cacher.rc diff --git a/salt/sys-syncthing/configure-browser.sls b/salt/sys-syncthing/configure-browser.sls index 42eac5d..7f6520c 100644 --- a/salt/sys-syncthing/configure-browser.sls +++ b/salt/sys-syncthing/configure-browser.sls @@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' %} +include: + - browser.configure + "{{ slsdotpath }}-browser-rc.local": file.managed: - name: /rw/config/rc.local.d/50-sys-syncthing.rc diff --git a/salt/sys-syncthing/configure.sls b/salt/sys-syncthing/configure.sls index 60ff042..6d7a9da 100644 --- a/salt/sys-syncthing/configure.sls +++ b/salt/sys-syncthing/configure.sls @@ -1,10 +1,13 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. +SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. SPDX-License-Identifier: AGPL-3.0-or-later #} +include: + - dotfiles.copy-xfce + "{{ slsdotpath }}-rc.local": file.managed: - name: /rw/config/rc.local.d/50-sys-syncthing.rc