mirror of
https://github.com/ben-grande/qusal.git
synced 2025-08-04 20:24:17 -04:00
Merge 703d5748fa into 382e582730
This commit is contained in:
3nprob
GitHub
commit
cd9ab17f2a
8 changed files with 134 additions and 25 deletions
|
|
@ -6,6 +6,7 @@ GPU GUI domain in Qubes OS.
|
|||
|
||||
* [Description](#description)
|
||||
* [Installation](#installation)
|
||||
* [Desktop Environment and Window Manager](#desktop-environment-and-window-manager)
|
||||
* [Uninstallation](#uninstallation)
|
||||
* [Usage](#usage)
|
||||
|
||||
|
|
@ -47,6 +48,14 @@ sudo qubesctl state.apply sys-gui-gpu.prefs
|
|||
|
||||
<!-- pkg:end:post-install -->
|
||||
|
||||
### Desktop Environment and Window Manager
|
||||
|
||||
To install and set up an XFCE desktop environment:
|
||||
|
||||
```sh
|
||||
sudo qubesctl --skip-dom0 --targets=tpl-sys-gui-gpu state.apply sys-gui.install-xfce
|
||||
```
|
||||
|
||||
The formula assumes Intel graphics card, if you have a card from another
|
||||
vendor, please use
|
||||
[qvm-pci](https://www.qubes-os.org/doc/how-to-use-pci-devices/#qvm-pci-usage)
|
||||
|
|
|
|||
10
salt/sys-gui-gpu/install-xfce.top
Normal file
10
salt/sys-gui-gpu/install-xfce.top
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{#
|
||||
SPDX-FileCopyrightText: 2025 The Qusal Community <https://github.com/ben-grande/qusal>
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
#}
|
||||
|
||||
base:
|
||||
'tpl-sys-gui-gpu':
|
||||
- sys-gui.install-xfce
|
||||
|
||||
|
|
@ -6,6 +6,7 @@ VNC GUI domain in Qubes OS.
|
|||
|
||||
* [Description](#description)
|
||||
* [Installation](#installation)
|
||||
* [Desktop Environment and Window Manager](#desktop-environment-and-window-manager)
|
||||
* [Uninstallation](#uninstallation)
|
||||
* [Usage](#usage)
|
||||
|
||||
|
|
@ -47,6 +48,14 @@ sudo qubesctl state.apply sys-gui-vnc.prefs
|
|||
|
||||
<!-- pkg:end:post-install -->
|
||||
|
||||
### Desktop Environment and Window Manager
|
||||
|
||||
To install and set up an XFCE desktop environment:
|
||||
|
||||
```sh
|
||||
sudo qubesctl --skip-dom0 --targets=tpl-sys-gui state.apply sys-gui.install-xfce
|
||||
```
|
||||
|
||||
Shutdown all your running qubes as the global property `default_guivm` has
|
||||
changed to `sys-gui-vnc`.
|
||||
|
||||
|
|
|
|||
10
salt/sys-gui-vnc/install-xfce.top
Normal file
10
salt/sys-gui-vnc/install-xfce.top
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{#
|
||||
SPDX-FileCopyrightText: 2025 The Qusal Community <https://github.com/ben-grande/qusal>
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
#}
|
||||
|
||||
base:
|
||||
'tpl-sys-gui':
|
||||
- sys-gui.install-xfce
|
||||
|
||||
|
|
@ -6,6 +6,7 @@ Hybrid GUI domain in Qubes OS.
|
|||
|
||||
* [Description](#description)
|
||||
* [Installation](#installation)
|
||||
* [Desktop Environment and Window Manager](#desktop-environment-and-window-manager)
|
||||
* [Uninstallation](#uninstallation)
|
||||
* [Usage](#usage)
|
||||
|
||||
|
|
@ -47,6 +48,14 @@ sudo qubesctl state.apply sys-gui.prefs
|
|||
|
||||
<!-- pkg:end:post-install -->
|
||||
|
||||
### Desktop Environment and Window Manager
|
||||
|
||||
To install and set up an XFCE desktop environment:
|
||||
|
||||
```sh
|
||||
sudo qubesctl --skip-dom0 --targets=tpl-sys-gui state.apply sys-gui.install-xfce
|
||||
```
|
||||
|
||||
Shutdown all your running qubes as the global property `default_guivm` has
|
||||
changed to `sys-gui`.
|
||||
|
||||
|
|
|
|||
65
salt/sys-gui/install-xfce.sls
Normal file
65
salt/sys-gui/install-xfce.sls
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{#
|
||||
SPDX-FileCopyrightText: 2019 Frederic Pierret <frederic.pierret@qubes-os.org>
|
||||
SPDX-FileCopyrightText: 2020 - 2024 Marmarek Marczykowski-Gorecki <marmarek@invisiblethingslab.com>
|
||||
SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
Upstream pkg.installed installs weak_deps/recommends.
|
||||
#}
|
||||
|
||||
{% if grains['nodename'] != 'dom0' -%}
|
||||
|
||||
include:
|
||||
- {{ slsdotpath }}.install
|
||||
|
||||
"{{ slsdotpath }}-installed-xfce":
|
||||
pkg.installed:
|
||||
- require:
|
||||
- sls: {{ slsdotpath }}.install
|
||||
- install_recommends: False
|
||||
- skip_suggestions: True
|
||||
- setopt: "install_weak_deps=False"
|
||||
- pkgs:
|
||||
# Xfce related packages
|
||||
- arc-theme
|
||||
- xdg-user-dirs-gtk
|
||||
- xfce4-appfinder
|
||||
- xfce4-datetime-plugin
|
||||
- xfce4-panel
|
||||
- xfce4-places-plugin
|
||||
- xfce4-power-manager
|
||||
- xfce4-pulseaudio-plugin
|
||||
- xfce4-session
|
||||
- xfce4-settings
|
||||
- xfce4-settings-qubes
|
||||
- xfce4-taskmanager
|
||||
- xfce4-terminal
|
||||
- xfconf
|
||||
- xfwm4
|
||||
|
||||
{% set pkg = {
|
||||
'Debian': {
|
||||
'pkg': ['blackbird-gtk-theme', 'gnome-themes-standard',
|
||||
'greybird-gtk-theme', 'gtk3-engines-xfce', 'libxfce4ui-utils',
|
||||
'xfce4-screenshooter', 'xfdesktop4']
|
||||
},
|
||||
'RedHat': {
|
||||
'pkg': ['adwaita-gtk2-theme', 'adwaita-icon-theme', 'greybird-dark-theme',
|
||||
'greybird-light-theme', 'greybird-xfce4-notifyd-theme',
|
||||
'greybird-xfwm4-theme', 'gtk-xfce-engine',
|
||||
'xfce4-about', 'xfce4-screenshooter-plugin', 'xfdesktop',
|
||||
'xfwm4-themes']
|
||||
},
|
||||
}.get(grains.os_family) -%}
|
||||
|
||||
"{{ slsdotpath }}-installed-xfce-os-specific":
|
||||
pkg.installed:
|
||||
- require:
|
||||
- sls: {{ slsdotpath }}.install
|
||||
- install_recommends: False
|
||||
- skip_suggestions: True
|
||||
- setopt: "install_weak_deps=False"
|
||||
- pkgs: {{ pkg.pkg|sequence|yaml }}
|
||||
|
||||
{% endif -%}
|
||||
10
salt/sys-gui/install-xfce.top
Normal file
10
salt/sys-gui/install-xfce.top
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{#
|
||||
SPDX-FileCopyrightText: 2025 The Qusal Community <https://github.com/ben-grande/qusal>
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
#}
|
||||
|
||||
base:
|
||||
'tpl-sys-gui':
|
||||
- sys-gui.install-xfce
|
||||
|
||||
|
|
@ -28,37 +28,24 @@ include:
|
|||
- qubes-desktop-linux-manager
|
||||
- qubes-manager
|
||||
- qubes-vm-guivm
|
||||
# Xfce related packages
|
||||
- arc-theme
|
||||
- gvfs
|
||||
- xdg-user-dirs-gtk
|
||||
- xfce4-appfinder
|
||||
- xfce4-datetime-plugin
|
||||
- xfce4-panel
|
||||
- xfce4-places-plugin
|
||||
- xfce4-power-manager
|
||||
- xfce4-pulseaudio-plugin
|
||||
- xfce4-session
|
||||
- xfce4-settings
|
||||
- xfce4-settings-qubes
|
||||
- xfce4-taskmanager
|
||||
- xfce4-terminal
|
||||
- xfconf
|
||||
- xfwm4
|
||||
|
||||
|
||||
{% set pkg = {
|
||||
'Debian': {
|
||||
'pkg': ['blackbird-gtk-theme', 'gnome-themes-standard',
|
||||
'greybird-gtk-theme', 'gtk3-engines-xfce', 'libxfce4ui-utils',
|
||||
'lightdm', 'xfce4-screenshooter', 'xfdesktop4', 'xscreensaver']
|
||||
'pkg': [
|
||||
'gnome-themes-standard',
|
||||
'breeze-cursor-theme', 'breeze-icon-theme', 'breeze-gtk-theme', 'gtk3-engines-breeze',
|
||||
'lightdm',
|
||||
'xscreensaver',
|
||||
]
|
||||
},
|
||||
'RedHat': {
|
||||
'pkg': ['dummy-psu-receiver', 'dummy-psu-module', 'dummy-backlight-vm',
|
||||
'adwaita-gtk2-theme', 'adwaita-icon-theme', 'greybird-dark-theme',
|
||||
'greybird-light-theme', 'greybird-xfce4-notifyd-theme',
|
||||
'greybird-xfwm4-theme', 'gtk-xfce-engine', 'lightdm-gtk',
|
||||
'xfce4-about', 'xfce4-screenshooter-plugin', 'xfdesktop',
|
||||
'xfwm4-themes', 'xscreensaver-base']
|
||||
'adwaita-gtk2-theme', 'adwaita-icon-theme',
|
||||
'breeze-cursor-theme', 'breeze-icon-theme', 'breeze-gtk',
|
||||
'lightdm-gtk',
|
||||
'xscreensaver-base',
|
||||
]
|
||||
},
|
||||
}.get(grains.os_family) -%}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue