fix: thunar requires xfce helpers to find terminal

ben-grande · Jan 31, 2024 · 9de8b2b · 9de8b2b
1 parent 41c48d9
commit 9de8b2b
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 4 deletions.
diff --git 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
 ```
 <!-- pkg:end:post-install -->

diff --git a/salt/browser/configure.sls b/salt/browser/configure.sls
@@ -0,0 +1,14 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <[email protected]>
+
+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
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
+
+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
@@ -10,3 +10,5 @@ base:
     - browser.create
   'tpl-browser':
     - browser.install
+  'dvm-browser':
+    - browser.configure
diff --git a/salt/dotfiles b/salt/dotfiles
diff --git 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
 ```
 <!-- pkg:end:post-install -->

diff --git a/salt/reader/configure.sls b/salt/reader/configure.sls
@@ -0,0 +1,14 @@
+{#
+SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
+
+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
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <[email protected]>
+
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,10 +1,13 @@
 {#
 SPDX-FileCopyrightText: 2022 unman <[email protected]>
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <[email protected]>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <[email protected]>
 
 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
+2 −1		copy-all.sls
+27 −0		copy-xfce.sls
+9 −0		copy-xfce.top
+9 −0		files/xfce/.config/xfce4/helpers.rc