From d43f755ccfe450f6bed527192b513236d4ae080c Mon Sep 17 00:00:00 2001 From: Gabriel Barrantes Date: Sun, 5 Oct 2025 14:22:21 -0600 Subject: [PATCH] Revert --- mkosi.conf.d/10-packages-cli.conf | 1 + mkosi.conf.d/60-packages-hw-enablement.conf | 1 - .../usr/bin/_kde-linux-install-flatpaks | 2 +- .../usr/lib/sysctl.d/00-kde-linux-default.conf | 9 --------- .../systemd/system-preset/50-kde-linux.preset | 1 - .../system.conf.d/00-kde-linux-default.conf | 7 ------- .../user.conf.d/00-kde-linux-default.conf | 7 ------- .../limits.d/00-kde-linux-default.conf | 18 ------------------ mkosi.postinst.chroot | 1 - 9 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 mkosi.extra/usr/share/factory/etc/security/limits.d/00-kde-linux-default.conf diff --git a/mkosi.conf.d/10-packages-cli.conf b/mkosi.conf.d/10-packages-cli.conf index 26730be..2f076fc 100644 --- a/mkosi.conf.d/10-packages-cli.conf +++ b/mkosi.conf.d/10-packages-cli.conf @@ -13,6 +13,7 @@ Packages=alsa-utils # alsamixer and other useful audio debugging tools fastfetch fd gping + grml-zsh-config htop jq kdialog # custom dialogs for automation diff --git a/mkosi.conf.d/60-packages-hw-enablement.conf b/mkosi.conf.d/60-packages-hw-enablement.conf index 47c3946..b9b6b48 100644 --- a/mkosi.conf.d/60-packages-hw-enablement.conf +++ b/mkosi.conf.d/60-packages-hw-enablement.conf @@ -8,7 +8,6 @@ Packages=acsccid # ACS CCID smart card readers dosfstools # Manipulating DOS filesystems fprintd # Fingerprint authentication iio-sensor-proxy # Auto-rotation - linux-firmware-marvell # Firmware files for marvell products steam-devices-git # Valve game controllers thermald # Improved thermal management and performance for Intel CPUs tpm2-tss # TPM support diff --git a/mkosi.extra/usr/bin/_kde-linux-install-flatpaks b/mkosi.extra/usr/bin/_kde-linux-install-flatpaks index b1b7ee9..b0675c3 100755 --- a/mkosi.extra/usr/bin/_kde-linux-install-flatpaks +++ b/mkosi.extra/usr/bin/_kde-linux-install-flatpaks @@ -4,4 +4,4 @@ set -eux -flatpak install --noninteractive --assumeyes --sideload-repo=/usr/share/factory/var/lib/flatpak/.ostree/repo org.gtk.Gtk3theme.Breeze org.kde.gwenview org.kde.okular org.kde.kate org.kde.kwrite org.kde.haruna org.kde.ark org.mozilla.firefox +flatpak install --noninteractive --assumeyes --sideload-repo=/usr/share/factory/var/lib/flatpak/.ostree/repo org.kde.gwenview org.kde.okular org.kde.kate org.kde.kwrite org.kde.haruna org.kde.ark org.mozilla.firefox diff --git a/mkosi.extra/usr/lib/sysctl.d/00-kde-linux-default.conf b/mkosi.extra/usr/lib/sysctl.d/00-kde-linux-default.conf index 0bf662b..b112284 100644 --- a/mkosi.extra/usr/lib/sysctl.d/00-kde-linux-default.conf +++ b/mkosi.extra/usr/lib/sysctl.d/00-kde-linux-default.conf @@ -11,17 +11,8 @@ vm.page-cluster = 0 vm.watermark_boost_factor = 0 # Make kswapd more aggressive because zram is cheap vm.watermark_scale_factor = 125 -# Many Windows games need this disabled to run with proper performance; they abuse split locks -kernel.split_lock_mitigate = 0 # Not needed for us; disabling it increases speed and reduces power consumption kernel.nmi_watchdog = 0 -# Disable kexec as a security measure -kernel.kexec_load_disabled=1 -# Use 'bbr' to achieve higher throughput when sending to high-latency destinations. -# Also 'fq' to prevent one greedy app from causing lag (bufferbloat) for everything else. -# `bbr` relies on pacing, and thus performs better with the `fq` qdisc. -net.ipv4.tcp_congestion_control = bbr -net.core.default_qdisc = fq # Ensure that applications don't break/complain from hitting the limit fs.inotify.max_user_instances = 8192 fs.inotify.max_user_watches = 524288 diff --git a/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset b/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset index dd163aa..39ecda3 100644 --- a/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset +++ b/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset @@ -19,7 +19,6 @@ enable kde-linux-powertop.service enable tuned.service enable tuned-ppd.service enable thermald.service -enable pcscd.socket # nvidia specific services (shouldn't affect non-nvidia hardware) enable nvidia-suspend.service diff --git a/mkosi.extra/usr/lib/systemd/system.conf.d/00-kde-linux-default.conf b/mkosi.extra/usr/lib/systemd/system.conf.d/00-kde-linux-default.conf index b02ae3e..cb064cd 100644 --- a/mkosi.extra/usr/lib/systemd/system.conf.d/00-kde-linux-default.conf +++ b/mkosi.extra/usr/lib/systemd/system.conf.d/00-kde-linux-default.conf @@ -1,14 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL # SPDX-FileCopyrightText: 2023 Harald Sitter -# SPDX-FileCopyrightText: 2025 Thomas Duckworth [Manager] TimeoutStartSec=8s DefaultTimeoutStartSec=16s DefaultTimeoutStopSec=8s -# Increase the maximum locked memory limit to allow apps which may require this -# to lock more memory, such as digital audio workstations. -DefaultLimitMEMLOCK=infinity -# Increase the number of file descriptors available to user processes -# to allow apps which may require this to open more files simultaneously. -DefaultLimitNOFILE=4096:524288 \ No newline at end of file diff --git a/mkosi.extra/usr/lib/systemd/user.conf.d/00-kde-linux-default.conf b/mkosi.extra/usr/lib/systemd/user.conf.d/00-kde-linux-default.conf index 0b6acef..0f1be80 100644 --- a/mkosi.extra/usr/lib/systemd/user.conf.d/00-kde-linux-default.conf +++ b/mkosi.extra/usr/lib/systemd/user.conf.d/00-kde-linux-default.conf @@ -1,14 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL # SPDX-FileCopyrightText: 2025 Hadi Chokr -# SPDX-FileCopyrightText: 2025 Thomas Duckworth [Manager] TimeoutStartSec=8s DefaultTimeoutStartSec=16s DefaultTimeoutStopSec=8s -# Increase the maximum locked memory limit to allow apps which may require this -# to lock more memory, such as digital audio workstations. -DefaultLimitMEMLOCK=infinity -# Increase the number of file descriptors available to user processes -# to allow apps which may require this to open more files simultaneously. -DefaultLimitNOFILE=4096:524288 \ No newline at end of file diff --git a/mkosi.extra/usr/share/factory/etc/security/limits.d/00-kde-linux-default.conf b/mkosi.extra/usr/share/factory/etc/security/limits.d/00-kde-linux-default.conf deleted file mode 100644 index c61ef78..0000000 --- a/mkosi.extra/usr/share/factory/etc/security/limits.d/00-kde-linux-default.conf +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -# SPDX-FileCopyrightText: 2025 Thomas Duckworth - -# This sets the open file limit and memory lock limit for the users logged in via PAM, -# more specifically, users logged in on via SSH or tty (console). -# Limits related to terminals in graphical sessions depend on a -# change in /usr/lib/systemd/user.conf.d or system.conf.d config files. -# This does not affect the open file limit or memory lock limit of system services. - -# Increase the number of file descriptors available to user processes -# to allow apps which may require this to open more files simultaneously. -* soft nofile 4096 -* hard nofile 524288 - -# Increase the maximum locked memory limit to allow apps which may require this -# to lock more memory, such as digital audio workstations. -* soft memlock 2147484 -* hard memlock 2147484 \ No newline at end of file diff --git a/mkosi.postinst.chroot b/mkosi.postinst.chroot index 315c4c9..8ca1cab 100755 --- a/mkosi.postinst.chroot +++ b/mkosi.postinst.chroot @@ -93,7 +93,6 @@ download_flatpaks() { # Install KWrite from Flathub for now, until it has a nightly repo. flatpak install --or-update --noninteractive --assumeyes flathub \ - org.gtk.Gtk3theme.Breeze \ org.kde.kwrite \ org.mozilla.firefox