diff options
| author | David Knaack <davidkna@users.noreply.github.com> | 2021-04-05 16:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 16:47:49 +0200 |
| commit | b791383a940274ec2b32c75ede12b527caf3b019 (patch) | |
| tree | 7aa47c0613f7ea294914733f2cff9ac65645c45b | |
| parent | 7273c8a42a4c21e3a42fccb5b04d78b94195b6ff (diff) | |
fix(configure): fix print-config issues (#2556)
| -rw-r--r-- | src/configs/mod.rs | 10 | ||||
| -rw-r--r-- | src/configs/starship_root.rs | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/configs/mod.rs b/src/configs/mod.rs index 70a55c681..559d0040d 100644 --- a/src/configs/mod.rs +++ b/src/configs/mod.rs @@ -66,8 +66,12 @@ pub use starship_root::*; #[derive(Default, Serialize, ModuleConfig, Clone)] #[serde(default)] pub struct FullConfig<'a> { - #[serde(flatten)] - root: starship_root::StarshipRootConfig<'a>, + // Root config + pub format: &'a str, + pub scan_timeout: u64, + pub command_timeout: u64, + pub add_newline: bool, + // modules aws: aws::AwsConfig<'a>, battery: battery::BatteryDisplayConfig<'a>, character: character::CharacterConfig<'a>, @@ -88,7 +92,7 @@ pub struct FullConfig<'a> { git_commit: git_commit::GitCommitConfig<'a>, git_state: git_state::GitStateConfig<'a>, git_status: git_status::GitStatusConfig<'a>, - go: go::GoConfig<'a>, + golang: go::GoConfig<'a>, helm: helm::HelmConfig<'a>, hg_branch: hg_branch::HgBranchConfig<'a>, hostname: hostname::HostnameConfig<'a>, diff --git a/src/configs/starship_root.rs b/src/configs/starship_root.rs index cefa85075..1c96cacd0 100644 --- a/src/configs/starship_root.rs +++ b/src/configs/starship_root.rs @@ -2,6 +2,7 @@ use crate::{config::ModuleConfig, module::ALL_MODULES}; use serde::Serialize; +// On changes please also update the `FullConfig` struct in `mod.rs` #[derive(Clone, Serialize)] pub struct StarshipRootConfig<'a> { pub format: &'a str, |