✨ meta packages

src/install/desktop.rs

@@ -1,15 +1,10 @@
-use crate::{
+use crate::{config::InstallConfig, linux::install_file, pkg::install_pkgs, print_status};
-    config::InstallConfig,
-    linux::install_file,
-    pkg::{self, install_pkgs},
-    print_status,
-};
 
 use super::navos::setup_navos;
 
 pub fn setup_desktop(conf: &InstallConfig) {
     setup_navos();
-    install_pkgs(&pkg::DESKTOP_PKG);
+    install_pkgs(&["navos_desktop"]);
     print_status("Enable SDDM");
     print_status("Set keyboard layout for SDDM");
     install_file(

src/install/mod.rs

@@ -51,7 +51,7 @@ pub mod zram;
 
 use crate::{
     config::InstallConfig,
-    pkg::{self, install_pkgs, pacstrap},
+    pkg::{install_pkgs, pacstrap},
 };
 
 /// Uncomment the first occurrence of a specified value in a file.
@@ -139,7 +139,7 @@ pub fn install_mnt(conf: InstallConfig, bare: bool) {
         }
         crate::config::InstallMode::Server => {
             setup_navos();
-            install_pkgs(&pkg::SERVER_PKG);
+            install_pkgs(&["navos_server"]);
         }
         crate::config::InstallMode::Kiosk => {
             // TODO

src/pkg.rs

@@ -3,32 +3,6 @@ use crate::{
     linux::{arch_chroot, run_command},
 };
 
-pub const DESKTOP_PKG: [&str; 17] = [
-    // Desktop
-    "plasma",
-    "sddm",
-    // Sound
-    "pipewire",
-    "pipewire-alsa",
-    "pipewire-pulse",
-    "pipewire-jack",
-    "wireplumber",
-    // Applications
-    "konsole",
-    "dolphin",
-    "ffmpegthumbs",
-    "kate",
-    "okular",
-    "gwenview",
-    "ark",
-    "flatpak",
-    // Misc
-    "navos/navos",
-    "man",
-];
-
-pub const SERVER_PKG: [&str; 2] = ["tmux", "navos/navos"];
-
 /// Install packages to the chroot environment at `/mnt`
 pub fn install_pkgs(pkg: &[&str]) {
     let mut cmd = vec!["pacman", "-Syu"];