From 5d23197394ffb65f5c3c2dbd88a5cb5c40c92875 Mon Sep 17 00:00:00 2001
From: JMARyA <jmarya@hydrar.de>
Date: Mon, 7 Apr 2025 22:19:17 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20meta=20packages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/install/desktop.rs |  9 ++-------
 src/install/mod.rs     |  4 ++--
 src/pkg.rs             | 26 --------------------------
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/src/install/desktop.rs b/src/install/desktop.rs
index 3b3b2d3..60b3c95 100644
--- a/src/install/desktop.rs
+++ b/src/install/desktop.rs
@@ -1,15 +1,10 @@
-use crate::{
-    config::InstallConfig,
-    linux::install_file,
-    pkg::{self, install_pkgs},
-    print_status,
-};
+use crate::{config::InstallConfig, linux::install_file, pkg::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(
diff --git a/src/install/mod.rs b/src/install/mod.rs
index 0d1312f..786de74 100644
--- a/src/install/mod.rs
+++ b/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
diff --git a/src/pkg.rs b/src/pkg.rs
index 5604561..b89d423 100644
--- a/src/pkg.rs
+++ b/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"];