Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(sddm): add mount unit for installing sddm themes in Discover #1944

Merged
merged 5 commits into from
Nov 23, 2024
+17 −0
Merged

feat(sddm): add mount unit for installing sddm themes in Discover #1944

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99f0421
feat(sddm): add mount unit for sddm themes to support KDE Discover in…
RealVishy Nov 18, 2024
4e0aee0
create needed directories and remove unneeded bazzite target
RealVishy Nov 19, 2024
7edf70b
Merge branch 'main' into vishy-feature
RealVishy Nov 19, 2024
325448d
add var directories to the mount and move directory creation to the t…
RealVishy Nov 21, 2024
7cc15b9
Merge branch 'main' into vishy-feature
m2Giles Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build_files/base/07-base-image-changes.sh
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work. You can use a tpmfiles.d conf file to make this directory after boot.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like the one used for the kde-sysmonitor workaround?

Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
rm -f /etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in
rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop
systemctl enable kde-sysmonitor-workaround.service
systemctl enable usr-share-sddm-themes.mount
mkdir -p /var/sddm_themes/themes /var/sddm_themes/themes.work

# Get Default Font since font fallback doesn't work
curl --retry 3 --output-dir /tmp -LO https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/FiraCode.zip
Expand Down
14 changes: 14 additions & 0 deletions system_files/kinoite/usr/lib/systemd/system/usr-share-sddm-themes.mount
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also requires mounts for /var

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Workaround to allow KDE Discover to install sddm themes

[Unit]
Description=KDE writable sddm workaround
RequiresMountsFor=/usr/share/sddm/themes

[Mount]
Type=overlay
What=overlay
Where=/usr/share/sddm/themes
Options=lowerdir=/usr/share/sddm/themes,upperdir=/var/sddm_themes/themes,workdir=/var/sddm_themes/themes.work
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably mount also should probably automatically create that /var/sddm_themes directory too tho, else it'll be mounting a non-existant folder :p

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added mkdir command to create the the working directory and the normal directory, I also ended up removing the PartOf= section since we don't want to recreate the bazzite target


[Install]
WantedBy=multi-user.target