aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEllie Huxtable <ellie@elliehuxtable.com>2024-05-14 10:23:05 +0700
committerGitHub <noreply@github.com>2024-05-14 10:23:05 +0700
commit58f0bd61e6e7b1a10e7460d8fe39921909ac216e (patch)
tree7ec3eebff65920d9ca51e596775b66bb5ff037bf
parentchore(deps): bump base64 from 0.21.7 to 0.22.1 (#2017) (diff)
downloadatuin-58f0bd61e6e7b1a10e7460d8fe39921909ac216e.zip
fix: alias enable/enabled in settings (#2021)
-rw-r--r--crates/atuin-client/src/settings.rs1
-rw-r--r--crates/atuin-client/src/settings/dotfiles.rs1
-rw-r--r--crates/atuin-server/src/settings.rs1
3 files changed, 3 insertions, 0 deletions
diff --git a/crates/atuin-client/src/settings.rs b/crates/atuin-client/src/settings.rs
index ed1c0a29..98a40496 100644
--- a/crates/atuin-client/src/settings.rs
+++ b/crates/atuin-client/src/settings.rs
@@ -346,6 +346,7 @@ pub struct Preview {
pub struct Daemon {
/// Use the daemon to sync
/// If enabled, requires a running daemon with `atuin daemon`
+ #[serde(alias = "enable")]
pub enabled: bool,
/// The daemon will handle sync on an interval. How often to sync, in seconds.
diff --git a/crates/atuin-client/src/settings/dotfiles.rs b/crates/atuin-client/src/settings/dotfiles.rs
index dd852781..bbaf914f 100644
--- a/crates/atuin-client/src/settings/dotfiles.rs
+++ b/crates/atuin-client/src/settings/dotfiles.rs
@@ -2,5 +2,6 @@ use serde::{Deserialize, Serialize};
#[derive(Debug, Serialize, Deserialize, Clone, Default)]
pub struct Settings {
+ #[serde(alias = "enable")]
pub enabled: bool,
}
diff --git a/crates/atuin-server/src/settings.rs b/crates/atuin-server/src/settings.rs
index 2d00df36..286b5688 100644
--- a/crates/atuin-server/src/settings.rs
+++ b/crates/atuin-server/src/settings.rs
@@ -104,6 +104,7 @@ pub fn example_config() -> &'static str {
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Tls {
+ #[serde(alias = "enabled")]
pub enable: bool,
pub cert_path: PathBuf,