From fedda098d6e9cface14627a18545b230c61aff3e Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Fri, 30 Jun 2023 23:47:16 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20drop=20cutefish?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tui.cpp | 2 +- src/utils.cpp | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/tui.cpp b/src/tui.cpp index 6422eda..92e2237 100644 --- a/src/tui.cpp +++ b/src/tui.cpp @@ -647,7 +647,7 @@ void install_desktop() noexcept { #endif // Prep variables - const std::vector available_des{"kde", "cutefish", "xfce", "sway", "wayfire", "i3wm", "gnome", "openbox", "bspwm", "lxqt", "cinnamon", "ukui"}; + const std::vector available_des{"kde", "xfce", "sway", "wayfire", "i3wm", "gnome", "openbox", "bspwm", "lxqt", "cinnamon", "ukui"}; auto screen = ScreenInteractive::Fullscreen(); std::string desktop_env{}; diff --git a/src/utils.cpp b/src/utils.cpp index 90af9bc..266a309 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -737,7 +737,6 @@ auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::v std::vector pkg_list{}; constexpr std::string_view kde{"kde"}; - constexpr std::string_view cutefish{"cutefish"}; constexpr std::string_view xfce{"xfce"}; constexpr std::string_view sway{"sway"}; constexpr std::string_view wayfire{"wayfire"}; @@ -804,18 +803,6 @@ auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::v std::move_iterator(to_be_inserted.end())); needed_xorg = true; } - found = ranges::search(desktop_env, cutefish); - if (!found.empty()) { - /* clang-format off */ - static constexpr std::array to_be_inserted{"fishui", "cutefish-calculator", "cutefish-core", "cutefish-dock", - "cutefish-filemanager", "cutefish-kwin-plugins", "cutefish-launcher", "cutefish-screenlocker", - "cutefish-settings", "cutefish-statusbar", "cutefish-terminal", "cutefish-wallpapers", - "cutefish-icons", "cutefish-qt-plugins", "libwnck3", "sddm"}; - /* clang-format on */ - pkg_list.insert(pkg_list.end(), std::move_iterator(to_be_inserted.begin()), - std::move_iterator(to_be_inserted.end())); - needed_xorg = true; - } found = ranges::search(desktop_env, wayfire); if (!found.empty()) { pkg_list.insert(pkg_list.cend(), {"cachyos-wayfire-settings", "wayfire-desktop-git", "egl-wayland", "wayland-protocols", "wofi", "ly", "xorg-xhost", "xorg-xwayland"});