Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-01-23 14:32:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🚧 chwd: update names

Browse Source
This commit is contained in:
Vladislav Nepogodin 2023-06-30 18:59:55 +04:00
parent 27c315db89
commit 0ff8160e72
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers.cpp
View File

@ -50,6 +50,8 @@ static void install_all_drivers() noexcept {
static void setup_graphics_card() noexcept {
std::string_view driver{};
/// TODO(vnepogodin): parse toml DBs
{
static constexpr auto UseSpaceBar = "\nUse [Spacebar] to de/select options listed.\n";
const auto& cmd = utils::exec("mhwd -l | awk '/ video-/{print $1}' | awk '$0=$0' | sort | uniq");
@ -74,7 +76,7 @@ static void setup_graphics_card() noexcept {
#ifdef NDEVENV
const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& cachepath = std::get<std::string>(config_data["cachepath"]);
const auto& cmd_formatted = fmt::format(FMT_COMPILE("mhwd --pmcachedir \"{}\" --pmroot {} -f -i pci {} 2>>/tmp/cachyos-install.log 2>&1"), cachepath, mountpoint, driver);
const auto& cmd_formatted = fmt::format(FMT_COMPILE("chwd --pmcachedir \"{}\" --pmroot {} -f -i pci {} 2>>/tmp/cachyos-install.log 2>&1"), cachepath, mountpoint, driver);
tui::detail::follow_process_log_widget({"/bin/sh", "-c", cmd_formatted});
std::ofstream{fmt::format(FMT_COMPILE("{}/.video_installed"), mountpoint)};
#endif
@ -110,11 +112,11 @@ static void install_graphics_menu() noexcept {
switch (selected) {
#ifdef NDEVENV
case 0:
utils::arch_chroot("mhwd -a pci free 0300");
utils::arch_chroot("chwd -a pci free 0300");
std::ofstream{fmt::format(FMT_COMPILE("{}/.video_installed"), mountpoint)};
break;
case 1:
utils::arch_chroot("mhwd -a pci nonfree 0300");
utils::arch_chroot("chwd -a pci nonfree 0300");
std::ofstream{fmt::format(FMT_COMPILE("{}/.video_installed"), mountpoint)};
break;
#endif

2
src/simple_tui.cpp
View File

@ -267,7 +267,7 @@ void menu_simple() noexcept {
#ifdef NDEVENV
if (server_mode == 0) {
utils::arch_chroot(fmt::format(FMT_COMPILE("mhwd -a pci {} 0300"), drivers_type));
utils::arch_chroot(fmt::format(FMT_COMPILE("chwd -a pci {} 0300"), drivers_type));
std::ofstream{fmt::format(FMT_COMPILE("{}/.video_installed"), mountpoint)};
}
#endif

2
src/utils.cpp
View File

@ -724,7 +724,7 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"});
}
pkg_list.insert(pkg_list.cend(), {"alacritty", "cachy-browser", "cachyos-fish-config", "cachyos-ananicy-rules", "cachyos-hello", "cachyos-hooks", "cachyos-kernel-manager", "power-profiles-daemon"});
pkg_list.insert(pkg_list.cend(), {"cachyos-rate-mirrors", "cachyos-packageinstaller", "cachyos-settings", "cachyos-zsh-config", "mhwd-cachyos", "mhwd-db-cachyos"});
pkg_list.insert(pkg_list.cend(), {"cachyos-rate-mirrors", "cachyos-packageinstaller", "cachyos-settings", "cachyos-zsh-config", "chwd", "chwd-db"});
}
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"});