navos/navinstall
navos/navinstall
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

refactor

Browse source
This commit is contained in:
JMARyA 2025-01-09 23:18:33 +01:00
parent 12b2cf4a96
commit 33a8fed192
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.rs
View file

@ -86,7 +86,7 @@ pub struct GeneralConfig {
// Root password // Root password
pub root_password: Option<String>, pub root_password: Option<String>,
// Enable Bluetooth // Enable Bluetooth
pub bluetooth: Option<bool> pub bluetooth: Option<bool>,
} }
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]

3
src/install/bluetooth.rs
View file

@ -1,7 +1,8 @@
use crate::{linux::systemd_service_enable, pkg::install_pkgs}; use crate::{linux::systemd_service_enable, pkg::install_pkgs, print_status};
/// Enable Bluetooth /// Enable Bluetooth
pub fn setup_bluetooth() { pub fn setup_bluetooth() {
print_status("Setting up Bluetooth");
install_pkgs(&["bluez", "bluez-utils"]); install_pkgs(&["bluez", "bluez-utils"]);
systemd_service_enable("bluetooth.service"); systemd_service_enable("bluetooth.service");
} }

2
src/install/mod.rs
View file

@ -20,6 +20,7 @@ use virt::setup_virtualization;
use yansi::{Color, Paint}; use yansi::{Color, Paint};
use zram::setup_zram; use zram::setup_zram;
pub mod bluetooth;
pub mod boot; pub mod boot;
pub mod desktop; pub mod desktop;
pub mod docker; pub mod docker;
@ -34,7 +35,6 @@ pub mod ssh;
pub mod user; pub mod user;
pub mod virt; pub mod virt;
pub mod zram; pub mod zram;
pub mod bluetooth;
use crate::{ use crate::{
config::InstallConfig, config::InstallConfig,

18
src/print.rs
View file

@ -58,11 +58,10 @@ pub fn print_config(conf: &InstallConfig) {
conf.general.timezone conf.general.timezone
)); ));
if conf.general.root_password.is_some() { if conf.general.root_password.is_some() {
general_info.add_str(format!( general_info.add_str(format!("🔑 Root Password {}", "✔️".paint(Color::Green)));
"🔑 {} {}", }
"Root Password".paint(Color::Yellow), if conf.general.bluetooth.unwrap_or_default() {
"✔️".paint(Color::Green) general_info.add_str(format!("🌀 Bluetooth {}", "✔️".paint(Color::Green)));
));
} }
root_info.add_tree("🔨 General", general_info); root_info.add_tree("🔨 General", general_info);
@ -79,7 +78,8 @@ pub fn print_config(conf: &InstallConfig) {
if !conf.pkg.pkg.is_empty() { if !conf.pkg.pkg.is_empty() {
pkg_info.add_str(format!( pkg_info.add_str(format!(
"📦 Additional packages: {}", "📦 {} {}",
"Additional packages:".paint(Color::Yellow),
conf.pkg.pkg.join(" ") conf.pkg.pkg.join(" ")
)); ));
} }
@ -145,7 +145,11 @@ pub fn print_config(conf: &InstallConfig) {
} }
if let Some(models) = &ai_conf.models { if let Some(models) = &ai_conf.models {
ai_info.add_str(format!("⬇️ Pull Models: {}", models.join(", "))); ai_info.add_str(format!(
"⬇️ {} {}",
"Pull Models:".paint(Color::Yellow),
models.join(", ")
));
} }
root_info.add_tree("🦙 Ollama", ai_info); root_info.add_tree("🦙 Ollama", ai_info);