forked from ublue-os/hwe
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Improve sway session compatibility in Sericea image (ublue-os#49)
* feat: Improve sway session compatibility in Sericea image * fix: Add additional compatibility options for Sway session * docs: clarify the stability of the sericea image
1 parent
6d4afbc
commit 65f2a0a
Showing
4 changed files
with
60 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# This file is a part of Fedora configuration for Sway and will be sourced | ||
# from /usr/bin/start-sway script for all users of the system. | ||
# User-specific variables should be placed in $XDG_CONFIG_HOME/sway/environment | ||
# | ||
# vim: set ft=sh: | ||
|
||
## Pass extra arguments to the /usr/bin/sway executable | ||
|
||
#SWAY_EXTRA_ARGS="$SWAY_EXTRA_ARGS --unsupported-gpu" | ||
SWAY_EXTRA_ARGS="$SWAY_EXTRA_ARGS --unsupported-gpu -D noscanout" | ||
#SWAY_EXTRA_ARGS="$SWAY_EXTRA_ARGS --debug" | ||
|
||
## Set environment variables | ||
|
||
# Useful variables for wlroots: | ||
# https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/master/docs/env_vars.md | ||
# | ||
#WLR_NO_HARDWARE_CURSORS=1 | ||
WLR_NO_HARDWARE_CURSORS=1 | ||
# Setting renderer to Vulkan may fix flickering but needs the following extensions: | ||
# - VK_EXT_image_drm_format_modifier | ||
# - VK_EXT_physical_device_drm | ||
# | ||
# Source: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/8e346922508aa3eaccd6e12f2917f6574f349843 | ||
#WLR_RENDERER=vulkan | ||
|
||
# Application compatibility |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Name: ublue-os-nvidia-addons | ||
Version: 0.2 | ||
Version: 0.3 | ||
Release: 1%{?dist} | ||
Summary: Additional files for nvidia driver support | ||
|
||
|
@@ -13,6 +13,7 @@ Source0: public_key.der | |
Source1: nvidia-container-runtime.repo | ||
Source2: config-rootless.toml | ||
Source3: nvidia-container.pp | ||
Source4: environment | ||
|
||
%description | ||
Adds various runtime files for nvidia support. These include a key for importing with mokutil to enable secure boot for nvidia kernel modules | ||
|
@@ -21,22 +22,37 @@ Adds various runtime files for nvidia support. These include a key for importing | |
%setup -q -c -T | ||
|
||
|
||
%install | ||
%build | ||
# Have different name for *.der in case kmodgenca is needed for creating more keys | ||
install -Dm0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/akmods/certs/akmods-nvidia.der | ||
install -Dm0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
install -Dm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/nvidia-container-runtime/config-rootless.toml | ||
install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/selinux/packages/nvidia-container.pp | ||
install -Dm0644 %{SOURCE0} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/pki/akmods/certs/akmods-nvidia.der | ||
install -Dm0644 %{SOURCE1} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/nvidia-container-runtime/config-rootless.toml | ||
install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/ublue-os/%{_datadir}/selinux/packages/nvidia-container.pp | ||
install -Dm0644 %{SOURCE4} %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/sway/environment | ||
|
||
sed -i 's@enabled=1@enabled=0@g' %{buildroot}%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
sed -i 's@enabled=1@enabled=0@g' %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
|
||
install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/pki/akmods/certs/akmods-nvidia.der %{buildroot}%{_sysconfdir}/pki/akmods/certs/akmods-nvidia.der | ||
install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo %{buildroot}%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_sysconfdir}/nvidia-container-runtime/config-rootless.toml %{buildroot}%{_sysconfdir}/nvidia-container-runtime/config-rootless.toml | ||
install -Dm0644 %{buildroot}%{_datadir}/ublue-os/%{_datadir}/selinux/packages/nvidia-container.pp %{buildroot}%{_datadir}/selinux/packages/nvidia-container.pp | ||
|
||
%files | ||
%attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/pki/akmods/certs/akmods-nvidia.der | ||
%attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
%attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/nvidia-container-runtime/config-rootless.toml | ||
%attr(0644,root,root) %{_datadir}/ublue-os/%{_datadir}/selinux/packages/nvidia-container.pp | ||
%attr(0644,root,root) %{_datadir}/ublue-os/%{_sysconfdir}/sway/environment | ||
%attr(0644,root,root) %{_sysconfdir}/pki/akmods/certs/akmods-nvidia.der | ||
%attr(0644,root,root) %{_sysconfdir}/yum.repos.d/nvidia-container-runtime.repo | ||
%attr(0644,root,root) %{_sysconfdir}/nvidia-container-runtime/config-rootless.toml | ||
%attr(0644,root,root) %{_datadir}/selinux/packages/nvidia-container.pp | ||
|
||
%changelog | ||
* Fri Feb 24 2023 Joshua Stone <[email protected]> - 0.3 | ||
- Add sway environment file | ||
- Put ublue-os modifications into a separate data directory | ||
|
||
* Thu Feb 16 2023 Joshua Stone <[email protected]> - 0.2 | ||
- Add nvidia-container-runtime repo | ||
- Add nvidia-container-runtime selinux policy file | ||
|