Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions comps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,17 @@
<packagereq type="mandatory">ultramarine-budgie-filesystem</packagereq>
<packagereq type="default">ultramarine-backgrounds-gnome</packagereq>
<packagereq type="default">ultramarine-backgrounds</packagereq>
<packagereq type="mandatory">lightdm</packagereq>
<packagereq type="mandatory">slick-greeter</packagereq>
<packagereq type="mandatory">sddm</packagereq>
<packagereq type="mandatory">sddm-wayland-generic</packagereq>
<packagereq type="mandatory">budgie-sddm-switch</packagereq>
<packagereq type="default">bluejay</packagereq>
<packagereq type="default">nemo-python</packagereq>
<packagereq type="default">nemo-preview</packagereq>
<packagereq type="default">nemo-emblems</packagereq>
<packagereq type="default">fluent-theme</packagereq>
<packagereq type="default">fluent-icon-theme</packagereq>
<packagereq type="default">ptyxis</packagereq>
<packagereq type="default">gnome-system-monitor</packagereq>
<packagereq type="default">mission-center</packagereq>
<packagereq type="default">gnome-software</packagereq>
<packagereq type="default">gs-plugin-ultramarine-pkgdb-collections</packagereq>
<packagereq type="default">xdg-user-dirs-gtk</packagereq>
Expand Down Expand Up @@ -205,9 +207,10 @@
<uservisible>false</uservisible>
<packagelist>
<!-- <packagereq type="default">gnome-extensions-app</packagereq> flatpak'd -->
<packagereq type="default">gnome-shell-extension-appindicator</packagereq>
<packagereq type="default">gnome-shell-extension-windowsNavigator</packagereq>
<packagereq type="default">gnome-shell-extension-appmenu-is-back</packagereq>
<packagereq type="default">gnome-shell-extension-grand-theft-focus</packagereq>
<packagereq type="default">gnome-shell-extension-battery_time</packagereq>
<packagereq type="default">ultramarine-backgrounds-gnome</packagereq>
<packagereq type="default">ultramarine-backgrounds-common</packagereq>
<packagereq type="default">ultramarine-release-gnome</packagereq>
Expand Down Expand Up @@ -261,7 +264,7 @@
<packagereq type="default">gnome-logs</packagereq>
<!-- <packagereq type="default">gnome-maps</packagereq> flatpak'd -->
<packagereq type="default">gnome-remote-desktop</packagereq>
<packagereq type="default">gnome-system-monitor</packagereq>
<packagereq type="default">mission-center</packagereq>
<packagereq type="default">gnome-user-docs</packagereq>
<packagereq type="default">gnome-user-share</packagereq>
<!-- <packagereq type="default">gnome-weather</packagereq> flatpak'd -->
Expand Down
11 changes: 10 additions & 1 deletion ultramarine/release/50_ultramarine-gnome.gschema.override
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
[org.gnome.shell]
enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com' , 'pop-shell@system76.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'appmenu-is-back@fthx']
enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com', 'grand-theft-focus@zalckos.github.com', 'batterytime@typeof.pw', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'appmenu-is-back@fthx']

[org.gnome.desktop.interface]
show-battery-percentage = true

[org.gnome.desktop.wm.preferences]
button-layout = 'appmenu:minimize,maximize,close'

[org.gnome.desktop.search-providers]
enabled = ['org.gnome.Calculator.desktop']
3 changes: 3 additions & 0 deletions ultramarine/release/85-display-manager.preset
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ enable sddm.service
enable kdm.service
enable xdm.service

# https://bugzilla.redhat.com/show_bug.cgi?id=2417187
enable plasmalogin.service

# https://bugzilla.redhat.com/show_bug.cgi?id=2305602
enable cosmic-greeter.service
17 changes: 10 additions & 7 deletions ultramarine/release/90-default.preset
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ disable systemd-boot-update.service
enable systemd-resolved.service

# https://fedoraproject.org/wiki/Changes/EnableSystemdOomd
enable systemd-oomd.service
enable systemd-oomd.*

# These presets were last validated en-masse on 2015-09-09
# https://fedorahosted.org/fesco/ticket/1472
Expand Down Expand Up @@ -255,6 +255,10 @@ enable upower.service
enable udisks2.service
enable polkit.service

# https://bugzilla.redhat.com/show_bug.cgi?id=2418550
#enable plasma-setup.service
# we deviate from upstream here, taidan is in use instead of plasma KISS

# https://bugzilla.redhat.com/show_bug.cgi?id=1187072
enable timedatex.service

Expand Down Expand Up @@ -454,10 +458,6 @@ enable nfs-client.target
# https://bugzilla.redhat.com/show_bug.cgi?id=2233948
enable cloud-config.service
enable cloud-final.service
# Remove the plain cloud-init.service in F44 or later
# https://src.fedoraproject.org/rpms/fedora-release/pull-request/369
# https://src.fedoraproject.org/rpms/cloud-init/pull-request/49
enable cloud-init.service
enable cloud-init-main.service
enable cloud-init-local.service

Expand All @@ -467,8 +467,8 @@ enable kernel-bootcfg-boot-successful.service

# Enable lvm-devices-import
# https://bugzilla.redhat.com/show_bug.cgi?id=2301651
enable /usr/lib/systemd/system/lvm-devices-import.path
enable /usr/lib/systemd/system/lvm-devices-import.service
enable lvm-devices-import.path
enable lvm-devices-import.service

# Enable fips-crypto-policy-overlay
# https://bugzilla.redhat.com/show_bug.cgi?id=2325499
Expand All @@ -482,3 +482,6 @@ enable gpio-manager.service
# https://bugzilla.redhat.com/show_bug.cgi?id=2397255
enable authselect-apply-changes.service

# Enable Intel Low Power Model Daemon
# https://bugzilla.redhat.com/show_bug.cgi?id=2442391
enable intel_lpmd.service
2 changes: 1 addition & 1 deletion ultramarine/release/linux-surface.repo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[linux-surface]
name=Surface Kernel
baseurl=https://pkg.surfacelinux.com/fedora/f42/
baseurl=https://pkg.surfacelinux.com/fedora/f43/
enabled=1
skip_if_unavailable=1
gpgkey=https://raw.githubusercontent.com/linux-surface/linux-surface/master/pkg/keys/surface.asc
Expand Down
39 changes: 0 additions & 39 deletions ultramarine/release/slick-greeter-budgie.conf

This file was deleted.

4 changes: 0 additions & 4 deletions ultramarine/release/ultramarine-release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ Source10: 89-ultramarine-default.preset
Source11: 81-atomic-desktop.preset

Source12: 60-ultramarine-presets.conf
Source13: slick-greeter-budgie.conf
Source14: slick-greeter-xfce.conf
Source15: 50_ultramarine-gnome.gschema.override

Expand Down Expand Up @@ -944,7 +943,6 @@ install %{SOURCE73} %{buildroot}%{_sysconfdir}/polycrystal/entries/ultramarine-x
# Budgie config
mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
install %{SOURCE12} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
install %{SOURCE13} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-budgie-slick-greeter.conf

# XFCE config
install %{SOURCE14} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-slick-greeter.conf
Expand Down Expand Up @@ -1129,7 +1127,6 @@ ln -sf firewalld-workstation.conf %{_sysconfdir}/firewalld/firewalld.conf
%{_sysconfdir}/dnf/protected.d/ultramarine-budgie.conf
%config %{_sysconfdir}/polycrystal/entries/ultramarine-budgie.json
%{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf
%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-budgie-slick-greeter.conf
%endif

%if %{with atomic_budgie}
Expand All @@ -1139,7 +1136,6 @@ ln -sf firewalld-workstation.conf %{_sysconfdir}/firewalld/firewalld.conf
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-budgie
%config %{_sysconfdir}/polycrystal/entries/ultramarine-budgie.json
%{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf
%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-budgie-slick-greeter.conf
%endif

%if %{with plasma}
Expand Down