diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs new file mode 100644 index 0000000000..eaab1958c7 --- /dev/null +++ b/crates/nu-path/src/helpers.rs @@ -0,0 +1,9 @@ +use std::path::PathBuf; + +pub fn home_dir() -> Option { + dirs_next::home_dir() +} + +pub fn config_dir() -> Option { + dirs_next::config_dir() +} diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs index 9606bc15cf..5cd1edf1c8 100644 --- a/crates/nu-path/src/lib.rs +++ b/crates/nu-path/src/lib.rs @@ -1,8 +1,10 @@ mod dots; mod expansions; +mod helpers; mod tilde; mod util; pub use expansions::{canonicalize, canonicalize_with, expand_path, expand_path_with}; +pub use helpers::{config_dir, home_dir}; pub use tilde::expand_tilde; pub use util::trim_trailing_slash; diff --git a/src/main.rs b/src/main.rs index 731c65bf1d..0ca6f3b04c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -91,6 +91,23 @@ fn main() -> Result<()> { let mut nu_prompt = NushellPrompt::new(); let stack = nu_protocol::engine::Stack::new(); + // Load config startup file + if let Some(mut config_path) = nu_path::config_dir() { + config_path.push("nushell"); + config_path.push("config.nu"); + + // FIXME: remove this message when we're ready + println!("Loading config from: {:?}", config_path); + + if config_path.exists() { + let config_filename = config_path.to_string_lossy().to_owned(); + + if let Ok(contents) = std::fs::read_to_string(&config_path) { + eval_source(engine_state.clone(), &stack, &contents, &config_filename); + } + } + } + loop { let prompt = update_prompt( PROMPT_COMMAND, @@ -124,45 +141,12 @@ fn main() -> Result<()> { continue; } - let (block, delta) = { - let engine_state = engine_state.borrow(); - let mut working_set = StateWorkingSet::new(&*engine_state); - let (output, err) = parse( - &mut working_set, - Some(&format!("entry #{}", entry_num)), - s.as_bytes(), - false, - ); - if let Some(err) = err { - report_error(&working_set, &err); - continue; - } - (output, working_set.render()) - }; - - EngineState::merge_delta(&mut *engine_state.borrow_mut(), delta); - - let state = nu_protocol::engine::EvaluationContext { - engine_state: engine_state.clone(), - stack: stack.clone(), - }; - - match eval_block(&state, &block, Value::nothing()) { - Ok(value) => { - if let Err(err) = print_value(value, &state) { - let engine_state = engine_state.borrow(); - let working_set = StateWorkingSet::new(&*engine_state); - - report_error(&working_set, &err); - } - } - Err(err) => { - let engine_state = engine_state.borrow(); - let working_set = StateWorkingSet::new(&*engine_state); - - report_error(&working_set, &err); - } - } + eval_source( + engine_state.clone(), + &stack, + &s, + &format!("entry #{}", entry_num), + ); } Ok(Signal::CtrlC) => { println!("Ctrl-c"); @@ -267,3 +251,54 @@ fn update_prompt<'prompt>( nu_prompt as &dyn Prompt } + +fn eval_source( + engine_state: Rc>, + stack: &Stack, + source: &str, + fname: &str, +) -> bool { + let (block, delta) = { + let engine_state = engine_state.borrow(); + let mut working_set = StateWorkingSet::new(&*engine_state); + let (output, err) = parse( + &mut working_set, + Some(fname), // format!("entry #{}", entry_num) + source.as_bytes(), + false, + ); + if let Some(err) = err { + report_error(&working_set, &err); + return false; + } + (output, working_set.render()) + }; + + EngineState::merge_delta(&mut *engine_state.borrow_mut(), delta); + + let state = nu_protocol::engine::EvaluationContext { + engine_state: engine_state.clone(), + stack: stack.clone(), + }; + + match eval_block(&state, &block, Value::nothing()) { + Ok(value) => { + if let Err(err) = print_value(value, &state) { + let engine_state = engine_state.borrow(); + let working_set = StateWorkingSet::new(&*engine_state); + + report_error(&working_set, &err); + return false; + } + } + Err(err) => { + let engine_state = engine_state.borrow(); + let working_set = StateWorkingSet::new(&*engine_state); + + report_error(&working_set, &err); + return false; + } + } + + true +}