From 83d492d91804e594855e3d9618e9ee88d8cd8bd1 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Sat, 22 Feb 2025 14:16:39 -0700 Subject: [PATCH 1/4] Remove nvtop .desktop file Amends 6341baed9d533c1c0ddb8a8cdd86139c4c079853. It's broken due to Konsole being in a Flatpak, which suffers from Bug 495551. Even if it were working, this is kind of useless since it just launches the CLI command anyway. Let's remove it. --- mkosi.finalize.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.finalize.chroot b/mkosi.finalize.chroot index cf13097..753d699 100755 --- a/mkosi.finalize.chroot +++ b/mkosi.finalize.chroot @@ -76,6 +76,7 @@ rm -rf \ /usr/share/applications/bvnc.desktop \ /usr/share/applications/cups.desktop \ /usr/share/applications/system-config-printer.desktop \ + /usr/share/applications/nvtop.desktop \ ## Remove documentation cruft. Offline documentation while neat is really not that useful in this day and age. ## Do not be verbose here, we'd blow right through the log limit. From 89ad1eb0496e3a0317488b46d6502d51777a3264 Mon Sep 17 00:00:00 2001 From: Lasath Fernando Date: Mon, 3 Mar 2025 01:53:21 +0000 Subject: [PATCH 2/4] Create appstream metadata file and add it to sysupdate config This is required for plasma/discover!957 to pick up and display KDE Linux --- appstream-component.xml | 53 +++++++++++++++++++ .../usr/lib/sysupdate.d/50-root-x86-64.conf | 1 + mkosi.extra/usr/lib/sysupdate.d/60-esp.conf | 1 + 3 files changed, 55 insertions(+) create mode 100644 appstream-component.xml diff --git a/appstream-component.xml b/appstream-component.xml new file mode 100644 index 0000000..664f07f --- /dev/null +++ b/appstream-component.xml @@ -0,0 +1,53 @@ + + + + + + org.kde.linux + KDE Linux + A modern Linux distribution focused on the KDE Plasma desktop environment + host + CC0-1.0 + GPL-3.0+ + +

KDE Linux is a user-friendly operating system built around the KDE Plasma desktop environment. It provides a complete computing experience with a focus on productivity, customization, and ease of use.

+
    +
  • Latest KDE Plasma desktop environment
    • +
  • Comprehensive suite of KDE applications
    • +
  • Rolling release model for up-to-date software
    • +
  • Strong focus on system stability
    • +
  • User-friendly installation process
    • +
+ + https://kdelinux.org + https://bugs.kdelinux.org + https://docs.kdelinux.org + KDE Linux Team + KDE + + linux + + + + +

Initial release of KDE Linux featuring:

+
    +
  • KDE Plasma 6.0
    • +
  • Linux kernel 6.7
    • +
  • Updated KDE Applications suite
    • +
  • New system installer
    • +
+ + + + + + KDE Linux desktop with Plasma 6.0 + https://kdelinux.org/screenshots/desktop.png + + + + diff --git a/mkosi.extra/usr/lib/sysupdate.d/50-root-x86-64.conf b/mkosi.extra/usr/lib/sysupdate.d/50-root-x86-64.conf index 79fa7f6..6cebdde 100644 --- a/mkosi.extra/usr/lib/sysupdate.d/50-root-x86-64.conf +++ b/mkosi.extra/usr/lib/sysupdate.d/50-root-x86-64.conf @@ -3,6 +3,7 @@ [Transfer] ProtectVersion=%A +AppStream=https://invent.kde.org/kde-linux/kde-linux/-/raw/master/appstream-component.xml [Source] Type=url-tar diff --git a/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf b/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf index de6a483..b0d51e6 100644 --- a/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf +++ b/mkosi.extra/usr/lib/sysupdate.d/60-esp.conf @@ -3,6 +3,7 @@ [Transfer] ProtectVersion=%A +AppStream=https://invent.kde.org/kde-linux/kde-linux/-/raw/master/appstream-component.xml [Source] Type=url-file From a05a01a2a6667db907d0c9251d319273aa562954 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Sun, 2 Mar 2025 18:01:29 -0700 Subject: [PATCH 3/4] Pre-install python-setproctitle for kde-builder It's a good thing to be able to run this out of the box. Fixes #156 --- mkosi.conf.d/70-packages-build.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.conf.d/70-packages-build.conf b/mkosi.conf.d/70-packages-build.conf index bfed200..1e1c7ed 100644 --- a/mkosi.conf.d/70-packages-build.conf +++ b/mkosi.conf.d/70-packages-build.conf @@ -9,4 +9,5 @@ Packages=boost yaml-cpp arch-install-scripts pacman + python-setproctitle # For kde-builder From c2171f965e162bc284e41dbb796b2a33e6e3ce80 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Mon, 3 Mar 2025 18:27:02 +0100 Subject: [PATCH 4/4] put .local/bin into PATH so kde-builder is happy without this it will error out and tell the user to fix their path --- .../usr/lib/environment.d/40-kde-linux-local-bin.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mkosi.extra/usr/lib/environment.d/40-kde-linux-local-bin.conf diff --git a/mkosi.extra/usr/lib/environment.d/40-kde-linux-local-bin.conf b/mkosi.extra/usr/lib/environment.d/40-kde-linux-local-bin.conf new file mode 100644 index 0000000..66a4540 --- /dev/null +++ b/mkosi.extra/usr/lib/environment.d/40-kde-linux-local-bin.conf @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +# SPDX-FileCopyrightText: 2025 Harald Sitter + +# Most notably kde-builder wants .local/bin in the PATH and will fail if it is not +PATH=$HOME/.local/bin:$PATH