diff --git a/mkosi.conf.d/10-packages-efi.conf b/mkosi.conf.d/15-packages-efi.conf similarity index 100% rename from mkosi.conf.d/10-packages-efi.conf rename to mkosi.conf.d/15-packages-efi.conf diff --git a/mkosi.conf.d/20-packages-graphics.conf b/mkosi.conf.d/20-packages-graphics.conf new file mode 100644 index 0000000..625c82f --- /dev/null +++ b/mkosi.conf.d/20-packages-graphics.conf @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +# SPDX-FileCopyrightText: 2023 Harald Sitter + +# nvidia-open appears to contain vulkan support already +[Content] +Packages=mesa + libva-intel-driver # Hardware accelerated video on old Intel GPUs + libva-mesa-driver # Hardware accelerated video on AMD GPUs + libva-nvidia-driver # Hardware accelerated video on NVIDIA GPUs + libva # Hardware accelerated video in gneeral + nvidia-open + vpl-gpu-rt # Hardware accelerated video on newer Intel GPUs + vulkan-icd-loader + vulkan-intel + vulkan-radeon + diff --git a/mkosi.conf.d/20-packages-network.conf b/mkosi.conf.d/25-packages-network.conf similarity index 76% rename from mkosi.conf.d/20-packages-network.conf rename to mkosi.conf.d/25-packages-network.conf index 383811b..98fb5ae 100644 --- a/mkosi.conf.d/20-packages-network.conf +++ b/mkosi.conf.d/25-packages-network.conf @@ -3,7 +3,10 @@ [Content] Packages=bind + dnsmasq # Hotspot creation and networking in VMs + freerdp2 # For KRDP iproute2 + libmtp # kio-extras, for MTP support networkmanager-l2tp # VPN support for NetworkManager networkmanager-openconnect # VPN support for NetworkManager networkmanager-openvpn # VPN support for NetworkManager @@ -12,4 +15,6 @@ Packages=bind networkmanager-vpnc # VPN support for NetworkManager nfs-utils nss-mdns # Needed for Avahi mDNS for local domain resolving etc. + samba # For sharing local folders via Samba + smbclient # For kio-extras ufw # Simple firewall; consider switching to firewalld once the KCM supports zones diff --git a/mkosi.conf.d/50-packages-sound.conf b/mkosi.conf.d/35-packages-sound.conf similarity index 85% rename from mkosi.conf.d/50-packages-sound.conf rename to mkosi.conf.d/35-packages-sound.conf index 80828d3..1d7b110 100644 --- a/mkosi.conf.d/50-packages-sound.conf +++ b/mkosi.conf.d/35-packages-sound.conf @@ -8,5 +8,6 @@ Packages= pipewire-zeroconf pipewire-ffado # FireWire/IEEE 1394 audio pipewire-libcamera + sof-firmware # Various audio chipsets wireplumber diff --git a/mkosi.conf.d/40-packages-printing.conf b/mkosi.conf.d/40-packages-printing.conf new file mode 100644 index 0000000..6dcf0de --- /dev/null +++ b/mkosi.conf.d/40-packages-printing.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +# SPDX-FileCopyrightText: 2023 Harald Sitter + +# nvidia-open appears to contain vulkan support already +[Content] +Packages=cups # Basic printing infrastructure + cups-browsed # Network printer auto-discovery + gutenprint # FOSS drivers for lots of printers + hplip # HP printers + splix # Certain Samsung printers + system-config-printer # Local printer auto-discovery diff --git a/mkosi.conf.d/50-packages-kde-dependencies.conf b/mkosi.conf.d/45-packages-kde-dependencies.conf similarity index 78% rename from mkosi.conf.d/50-packages-kde-dependencies.conf rename to mkosi.conf.d/45-packages-kde-dependencies.conf index e750160..e306560 100644 --- a/mkosi.conf.d/50-packages-kde-dependencies.conf +++ b/mkosi.conf.d/45-packages-kde-dependencies.conf @@ -3,10 +3,7 @@ [Content] -Packages=cups # print-manager - cups-browsed # print-manager - - ffmpeg # ffmpegthumbs +Packages=ffmpeg # ffmpegthumbs jxrlib # kimageformats libavif # kimageformats libheif # kimageformats @@ -16,20 +13,16 @@ Packages=cups # print-manager accountsservice # For users KCM editorconfig-core-c # ktexteditor - freerdp2 # krdp icoutils # kio-extras, for .exe thumbnails libappimage # kio-extras, for AppImage app thumbnails - libmtp # kio-extras, for MTP support switcheroo-control # kio, for launching apps on non-default GPU aspell # sonnet hspell # sonnet opencv # For spectacle - samba # For kdenetwork-filesharing fwupd # for Discover backend - smbclient # For kio-extras cryfs # plasma-vault, for compatibility encfs # plasma-vault, for compatibility diff --git a/mkosi.conf.d/50-packages-graphics.conf b/mkosi.conf.d/50-packages-graphics.conf deleted file mode 100644 index 98bd488..0000000 --- a/mkosi.conf.d/50-packages-graphics.conf +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -# SPDX-FileCopyrightText: 2023 Harald Sitter - -# nvidia-open appears to contain vulkan support already -[Content] -Packages=mesa - nvidia-open - vulkan-icd-loader - vulkan-intel - vulkan-radeon - diff --git a/mkosi.conf.d/60-packages-hw-enablement.conf b/mkosi.conf.d/60-packages-hw-enablement.conf index e368e93..fd255bb 100644 --- a/mkosi.conf.d/60-packages-hw-enablement.conf +++ b/mkosi.conf.d/60-packages-hw-enablement.conf @@ -5,22 +5,11 @@ Packages=acsccid # ACS CCID smart card readers bmusb # Specialty video capture/playback boxes from BlackMagicDesign ccid # Generic USB CCID/ICCD card readers - dnsmasq # Hotspot creation and networking in VMs dosfstools # Manipulating DOS filesystems fprintd # Fingerprint authentication - gutenprint # FOSS drivers for lots of printers - hplip # HP printers iio-sensor-proxy # Auto-rotation - libva-intel-driver # Hardware accelerated video on old Intel GPUs - libva-mesa-driver # Hardware accelerated video on AMD GPUs - libva-nvidia-driver # Hardware accelerated video on NVIDIA GPUs - libva # Hardware accelerated video in gneeral maliit-keyboard # Touch virtual keyboard - sof-firmware # Various audio chipsets - splix # Certain Samsung printers steam-devices-git # Valve game controllers - system-config-printer # Printer auto-discovery thermald # Improved thermal management and performance for Intel CPUs tpm2-tss # TPM support tuned-ppd # Power profiles - vpl-gpu-rt # Hardware accelerated video on newer Intel GPUs