From cc6348f7530f67caf356b56afc0b084cb98af7c4 Mon Sep 17 00:00:00 2001 From: mhk2012 Date: Thu, 18 Jan 2024 20:29:59 +0000 Subject: [PATCH 1/2] Update Kde packages (#9) * remove duplicate package * replace default phonon-gstreamer to phonon-vlc in KDE packages phonon-vlc (this is the only maintained and supported Phonon backend for KDE apps that use Phonon for their multimedia needs; the alternative phonon-gstreamer has been unmaintained since 2013 and should not be shipped by default, or at all, ideally) source: https://community.kde.org/Distributions/Packaging_Recommendations --- src/utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils.cpp b/src/utils.cpp index c5b4749..eb2492c 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -808,10 +808,10 @@ auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::v "cachyos-nord-kde-theme-git", "cachyos-iridescent-kde", "cachyos-emerald-kde-theme-git", "cachyos-kde-settings", "cachyos-themes-sddm", "cachyos-wallpapers", "char-white", "dolphin", "egl-wayland", "gwenview", "konsole", "kate", "kdeconnect", "kscreen", "kde-gtk-config", "khotkeys", "kinfocenter", - "kinit", "kscreen", "kwallet-pam", "kwalletmanager", "plasma-wayland-protocols", "plasma-wayland-session", + "kinit", "kwallet-pam", "kwalletmanager", "plasma-wayland-protocols", "plasma-wayland-session", "plasma-desktop", "plasma-framework5", "plasma-nm", "plasma-pa", "plasma-workspace", "plasma-integration", "plasma-firewall", "plasma-browser-integration", "plasma-systemmonitor", "plasma-thunderbolt", - "powerdevil", "ksysguard", "spectacle", "sddm", "sddm-kcm", "xsettingsd", "xdg-desktop-portal", "xdg-desktop-portal-kde"}; + "powerdevil", "ksysguard", "spectacle", "sddm", "sddm-kcm", "xsettingsd", "xdg-desktop-portal", "xdg-desktop-portal-kde", "phonon-qt5-vlc"}; /* clang-format on */ pkg_list.insert(pkg_list.end(), std::move_iterator(to_be_inserted.begin()), std::move_iterator(to_be_inserted.end())); From 9c6491deda1b028c3715a561010d95871feb70c9 Mon Sep 17 00:00:00 2001 From: mhk2012 Date: Fri, 19 Jan 2024 17:53:14 +0000 Subject: [PATCH 2/2] Update Base packages (#10) * add linux-firmware to base packages * add man page to base packages * add bcachefs tools to base packages --- src/utils.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/utils.cpp b/src/utils.cpp index eb2492c..8eb2695 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -733,9 +733,10 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector< const auto& server_mode = std::get(config_data["SERVER_MODE"]); const auto& mountpoint_info = std::get(config_data["MOUNTPOINT"]); - const auto& root_filesystem = utils::get_mountpoint_fs(mountpoint_info); - const auto& is_root_on_zfs = (root_filesystem == "zfs"); - const auto& is_root_on_btrfs = (root_filesystem == "btrfs"); + const auto& root_filesystem = utils::get_mountpoint_fs(mountpoint_info); + const auto& is_root_on_zfs = (root_filesystem == "zfs"); + const auto& is_root_on_btrfs = (root_filesystem == "btrfs"); + const auto& is_root_on_bcachefs = (root_filesystem == "bcachefs"); auto pkg_list = utils::make_multiline(packages, false, ' '); @@ -750,6 +751,9 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector< if (is_root_on_zfs) { pkg_list.insert(pkg_list.cend(), {"zfs-utils"}); } + if (is_root_on_bcachefs) { + pkg_list.insert(pkg_list.cend(), {"bcachefs-tools"}); + } if (server_mode == 0) { if (is_root_on_btrfs) { pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"}); @@ -765,7 +769,8 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector< pkg_list.insert(pkg_list.cend(), {"duf", "fsarchiver", "hwinfo", "inxi", "fastfetch"}); } pkg_list.insert(pkg_list.cend(), {"amd-ucode", "intel-ucode"}); - pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"}); + pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "linux-firmware", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"}); + pkg_list.insert(pkg_list.cend(), {"man-db", "less"}); pkg_list.insert(pkg_list.cend(), {"cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-v4-mirrorlist", "cachyos-keyring"}); return pkg_list;