0.2.0 tag (#15)

dgunzy · web-flow · commit 335eb830ec5a · 2025-11-15T22:10:11.000-04:00
* v0.2.0

Signed-off-by: Daniel Guns &lt;danbguns@gmail.com&gt;

* filling in rest of config

Signed-off-by: Daniel Guns &lt;danbguns@gmail.com&gt;

---------

Signed-off-by: Daniel Guns &lt;danbguns@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "flux9s"
 
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 authors = ["Dan Guns <danbguns@gmail.com>"]
 description = "A K9s-inspired terminal UI for monitoring Flux GitOps resources"
diff --git a/README.md b/README.md
@@ -105,6 +105,7 @@ By default, `flux9s` watches the `flux-system` namespace. Use `:ns all` to view
 
 - `:ns <namespace>` - Switch namespace
 - `:ns all` - View all namespaces
+- `:skin {skin-name}` - set skin (Must be in your systems flux9s/skins dir)
 - `:q` or `:q!` - Quit
 - `:help` - Show help
 
@@ -115,6 +116,14 @@ By default, `flux9s` watches the `flux-system` namespace. Use `:ns all` to view
 - `R` - Reconcile resource
 - `d` - Delete resource (with confirmation)
 
+### Terminal Commands
+
+- `flux9s config --help` - Show the config options
+- `flux9s config set {KEY} {VALUE}` - set a yaml option with the cli.
+- `flux9s config set ui.skin {skinname}` - set a skin that is in your systems flux9s/skins.
+
+> **Note:** Not all K9s skins are compatible with flux9s. flux9s skins follow a similar format but may require adjustments to work properly.
+
 ## Acknowledgments
 
 This project is inspired by and built with the following excellent tools:
diff --git a/src/config/schema.rs b/src/config/schema.rs
@@ -124,7 +124,7 @@ impl Default for Config {
 impl Default for UiConfig {
     fn default() -> Self {
         Self {
-            enable_mouse: default_true(),
+            enable_mouse: default_false(),
             headless: default_false(),
             no_icons: default_false(),
             skin: default_skin(),
diff --git a/src/main.rs b/src/main.rs
@@ -183,7 +183,15 @@ async fn main() -> Result<()> {
     tracing::debug!("Initializing Kubernetes client");
     let client = kube::create_client().await?;
     let context = kube::get_context().await?;
-    let default_namespace = kube::get_default_namespace().await;
+    // Use config.default_namespace if set, otherwise fall back to environment/default
+    let default_namespace = if config.default_namespace.is_empty()
+        || config.default_namespace == "all"
+        || config.default_namespace == "-A"
+    {
+        kube::get_default_namespace().await
+    } else {
+        Some(config.default_namespace.clone())
+    };
 
     if args.debug {
         tracing::info!("Connected to Kubernetes cluster: {}", context);
@@ -218,7 +226,7 @@ async fn main() -> Result<()> {
         default_namespace,
         watcher,
         client,
-        read_only,
+        config,
         theme,
     )
     .await?;
diff --git a/src/tui/app.rs b/src/tui/app.rs
@@ -45,7 +45,7 @@ pub struct App {
     confirmation_pending: Option<(String, String, String, char)>, // (resource_type, namespace, name, operation_key)
     status_message: Option<(String, bool)>,                       // (message, is_error)
     theme: Theme,
-    read_only: bool, // Readonly mode - prevents modification operations
+    config: crate::config::Config, // Application configuration
 }
 
 #[derive(Clone, Copy, PartialEq)]
@@ -61,7 +61,7 @@ impl App {
         state: ResourceState,
         context: String,
         namespace: Option<String>,
-        read_only: bool,
+        config: crate::config::Config,
         theme: Theme,
     ) -> Self {
         Self {
@@ -85,16 +85,20 @@ impl App {
             yaml_fetch_pending: None,
             yaml_fetched: None,
             yaml_fetch_rx: None,
-            show_splash: true,
-            splash_start_time: Some(std::time::Instant::now()),
+            show_splash: !config.ui.splashless, // Skip splash if splashless is true
+            splash_start_time: if config.ui.splashless {
+                None
+            } else {
+                Some(std::time::Instant::now())
+            },
             operation_registry: OperationRegistry::new(),
             pending_operation: None,
             operation_result_rx: None,
             last_operation_key: None,
             confirmation_pending: None,
             status_message: None,
             theme,
-            read_only,
+            config,
         }
     }
 
@@ -275,7 +279,7 @@ impl App {
                         if let Some(operation) = self.operation_registry.get_by_keybinding(op_key) {
                             if operation.is_valid_for(&resource.resource_type) {
                                 // Check readonly mode first
-                                if self.read_only {
+                                if self.config.read_only {
                                     self.status_message = Some((
                                         "Readonly mode is enabled. Operations are disabled."
                                             .to_string(),
@@ -429,7 +433,7 @@ impl App {
             match key.code {
                 crossterm::event::KeyCode::Char('y') | crossterm::event::KeyCode::Char('Y') => {
                     // Check readonly mode before confirming
-                    if self.read_only {
+                    if self.config.read_only {
                         self.confirmation_pending = None;
                         self.status_message = Some((
                             "Readonly mode is enabled. Operations are disabled.".to_string(),
@@ -465,7 +469,7 @@ impl App {
         op_key: char,
     ) {
         // Check readonly mode - prevent modification operations
-        if self.read_only {
+        if self.config.read_only {
             if self.operation_registry.get_by_keybinding(op_key).is_some() {
                 // All operations are modifications, so block them all in readonly mode
                 self.status_message = Some((
@@ -658,8 +662,8 @@ impl App {
 
         // Handle readonly toggle command
         if cmd_lower == "readonly" || cmd_lower == "read-only" {
-            self.read_only = !self.read_only;
-            let status = if self.read_only {
+            self.config.read_only = !self.config.read_only;
+            let status = if self.config.read_only {
                 "enabled"
             } else {
                 "disabled"
@@ -871,25 +875,33 @@ impl App {
         let chunks = Layout::default()
             .direction(Direction::Vertical)
             .constraints([
-                Constraint::Length(header_height as u16), // Dynamic header height
-                Constraint::Min(0),                       // Main content (flexible)
+                if self.config.ui.headless {
+                    Constraint::Length(0) // No header in headless mode
+                } else {
+                    Constraint::Length(header_height as u16) // Dynamic header height
+                },
+                Constraint::Min(0), // Main content (flexible)
                 Constraint::Length(footer_constraint as u16), // Footer (content + borders)
             ])
             .split(f.size());
 
         let resources = self.get_filtered_resources();
-        render_header(
-            f,
-            chunks[0],
-            &self.state,
-            &self.context,
-            &self.namespace,
-            &self.filter,
-            &self.selected_resource_type,
-            resources.len(),
-            self.read_only,
-            &self.theme,
-        );
+        // Only render header if not in headless mode
+        if !self.config.ui.headless {
+            render_header(
+                f,
+                chunks[0],
+                &self.state,
+                &self.context,
+                &self.namespace,
+                &self.filter,
+                &self.selected_resource_type,
+                resources.len(),
+                self.config.read_only,
+                &self.theme,
+                self.config.ui.no_icons,
+            );
+        }
         self.render_main(f, chunks[1]);
         render_footer(
             f,
@@ -937,6 +949,7 @@ impl App {
                         &self.selected_resource_type,
                         &self.resource_objects,
                         &self.theme,
+                        self.config.ui.no_icons,
                     );
                 }
                 View::ResourceDetail => {
diff --git a/src/tui/mod.rs b/src/tui/mod.rs
@@ -78,20 +78,24 @@ pub async fn run_tui(
     namespace: Option<String>,
     watcher: crate::watcher::ResourceWatcher,
     client: kube::Client,
-    read_only: bool,
+    config: crate::config::Config,
     theme: crate::tui::Theme,
 ) -> Result<()> {
     tracing::debug!("Initializing TUI");
 
     // Setup terminal
     enable_raw_mode()?;
     let mut stdout = io::stdout();
-    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
+    execute!(stdout, EnterAlternateScreen)?;
+    // Conditionally enable mouse capture based on config
+    if config.ui.enable_mouse {
+        execute!(stdout, EnableMouseCapture)?;
+    }
     let backend = CrosstermBackend::new(stdout);
     let mut terminal = Terminal::new(backend)?;
 
-    // Create app state with readonly mode and theme
-    let mut app = App::new(state, context, namespace.clone(), read_only, theme);
+    // Create app state with config and theme
+    let mut app = App::new(state, context, namespace.clone(), config.clone(), theme);
     app.set_watcher(watcher);
     app.set_kube_client(client);
 
@@ -265,11 +269,11 @@ pub async fn run_tui(
 
     // Restore terminal
     disable_raw_mode()?;
-    execute!(
-        terminal.backend_mut(),
-        LeaveAlternateScreen,
-        DisableMouseCapture
-    )?;
+    execute!(terminal.backend_mut(), LeaveAlternateScreen)?;
+    // Only disable mouse if it was enabled
+    if config.ui.enable_mouse {
+        execute!(terminal.backend_mut(), DisableMouseCapture)?;
+    }
     terminal.show_cursor()?;
 
     Ok(())
diff --git a/src/tui/views/header.rs b/src/tui/views/header.rs
@@ -22,6 +22,7 @@ pub fn render_header(
     filtered_count: usize, // Count of resources after filtering
     read_only: bool,       // Readonly mode status
     theme: &Theme,
+    no_icons: bool,
 ) {
     // Split header into left (info) and right (ASCII art)
     let header_chunks = Layout::default()
@@ -111,8 +112,13 @@ pub fn render_header(
     // Add readonly indicator if enabled
     if read_only {
         context_line_spans.push(Span::raw("  "));
+        let readonly_text = if no_icons {
+            "[READONLY]"
+        } else {
+            "🔒 READONLY"
+        };
         context_line_spans.push(Span::styled(
-            "🔒 READONLY",
+            readonly_text,
             Style::default()
                 .fg(theme.status_error)
                 .add_modifier(Modifier::BOLD),
@@ -139,9 +145,10 @@ pub fn render_header(
             ""
         };
 
+        let filter_icon = if no_icons { "[FILTER]" } else { "⚠ Filter: " };
         header_lines.push(Line::from(vec![
             Span::styled(
-                "⚠ Filter: ",
+                filter_icon,
                 Style::default()
                     .fg(theme.header_filter)
                     .add_modifier(Modifier::BOLD),
diff --git a/src/tui/views/resource_list.rs b/src/tui/views/resource_list.rs
@@ -24,6 +24,7 @@ pub fn render_resource_list(
     selected_resource_type: &Option<String>,
     resource_objects: &Arc<RwLock<HashMap<String, serde_json::Value>>>,
     theme: &Theme,
+    no_icons: bool,
 ) {
     let visible_height = (area.height as usize).saturating_sub(2);
 
@@ -109,7 +110,7 @@ pub fn render_resource_list(
 
                 // Status indicator
                 let (status_indicator, status_color) =
-                    get_status_indicator(r.ready, r.suspended, theme);
+                    get_status_indicator(r.ready, r.suspended, theme, no_icons);
 
                 let message = r.message.as_deref().unwrap_or("-");
                 let message_display = if message.len() > 40 {
@@ -131,14 +132,15 @@ pub fn render_resource_list(
             })
             .collect();
 
+        let status_width = if no_icons { 6 } else { 3 }; // "PAUSED" vs "●"
         let constraints: Vec<Constraint> = vec![
-            Constraint::Length(3),      // STATUS
-            Constraint::Min(15),        // NAMESPACE
-            Constraint::Min(30),        // NAME
-            Constraint::Min(20),        // TYPE
-            Constraint::Length(10),     // SUSPENDED
-            Constraint::Length(6),      // READY
-            Constraint::Percentage(40), // MESSAGE
+            Constraint::Length(status_width), // STATUS
+            Constraint::Min(15),              // NAMESPACE
+            Constraint::Min(30),              // NAME
+            Constraint::Min(20),              // TYPE
+            Constraint::Length(10),           // SUSPENDED
+            Constraint::Length(6),            // READY
+            Constraint::Percentage(40),       // MESSAGE
         ];
 
         (rows, header, constraints)
@@ -168,7 +170,7 @@ pub fn render_resource_list(
                 };
 
                 let (status_indicator, status_color) =
-                    get_status_indicator(r.ready, r.suspended, theme);
+                    get_status_indicator(r.ready, r.suspended, theme, no_icons);
 
                 // Get resource-specific fields from stored object
                 let key = crate::watcher::resource_key(&r.namespace, &r.name, &r.resource_type);
@@ -233,7 +235,7 @@ pub fn render_resource_list(
         let constraints: Vec<Constraint> = column_names
             .iter()
             .map(|col| match *col {
-                "STATUS" => Constraint::Length(3),
+                "STATUS" => Constraint::Length(if no_icons { 6 } else { 3 }),
                 "NAMESPACE" => Constraint::Min(15),
                 "NAME" => Constraint::Min(30),
                 "TYPE" => Constraint::Min(20),
@@ -268,12 +270,25 @@ fn get_status_indicator(
     ready: Option<bool>,
     suspended: Option<bool>,
     theme: &Theme,
+    no_icons: bool,
 ) -> (&'static str, Color) {
-    match (ready, suspended) {
-        (Some(true), Some(false)) => ("●", theme.status_ready),
-        (Some(true), Some(true)) => ("⏸", theme.status_suspended),
-        (Some(false), _) => ("✗", theme.status_error),
-        (None, Some(true)) => ("⏸", theme.status_suspended),
-        _ => ("○", theme.status_unknown),
+    if no_icons {
+        // Use text alternatives when icons are disabled
+        match (ready, suspended) {
+            (Some(true), Some(false)) => ("OK", theme.status_ready),
+            (Some(true), Some(true)) => ("PAUSED", theme.status_suspended),
+            (Some(false), _) => ("ERR", theme.status_error),
+            (None, Some(true)) => ("PAUSED", theme.status_suspended),
+            _ => ("?", theme.status_unknown),
+        }
+    } else {
+        // Use Unicode icons when enabled
+        match (ready, suspended) {
+            (Some(true), Some(false)) => ("●", theme.status_ready),
+            (Some(true), Some(true)) => ("⏸", theme.status_suspended),
+            (Some(false), _) => ("✗", theme.status_error),
+            (None, Some(true)) => ("⏸", theme.status_suspended),
+            _ => ("○", theme.status_unknown),
+        }
     }
 }
