mirror of
https://github.com/atuinsh/atuin.git
synced 2024-11-22 00:03:49 +01:00
refactor: rename atuin-config to atuin-dotfiles (#1817)
This commit is contained in:
parent
3d6b163546
commit
a5e1d25287
4
Cargo.lock
generated
4
Cargo.lock
generated
@ -185,7 +185,7 @@ dependencies = [
|
||||
"async-trait",
|
||||
"atuin-client",
|
||||
"atuin-common",
|
||||
"atuin-config",
|
||||
"atuin-dotfiles",
|
||||
"atuin-server",
|
||||
"atuin-server-postgres",
|
||||
"base64 0.21.7",
|
||||
@ -291,7 +291,7 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atuin-config"
|
||||
name = "atuin-dotfiles"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"atuin-client",
|
||||
|
@ -6,7 +6,7 @@ members = [
|
||||
"atuin-server-postgres",
|
||||
"atuin-server-database",
|
||||
"atuin-common",
|
||||
"atuin-config",
|
||||
"atuin-dotfiles",
|
||||
]
|
||||
|
||||
resolver = "2"
|
||||
|
@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "atuin-config"
|
||||
name = "atuin-dotfiles"
|
||||
edition = "2021"
|
||||
version = "0.1.0" # intentionally not the same as the rest
|
||||
|
@ -45,7 +45,7 @@ atuin-server-postgres = { path = "../atuin-server-postgres", version = "18.0.2",
|
||||
atuin-server = { path = "../atuin-server", version = "18.0.2", optional = true }
|
||||
atuin-client = { path = "../atuin-client", version = "18.0.2", optional = true, default-features = false }
|
||||
atuin-common = { path = "../atuin-common", version = "18.0.2" }
|
||||
atuin-config = { path = "../atuin-config", version = "0.1.0" }
|
||||
atuin-dotfiles = { path = "../atuin-dotfiles", version = "0.1.0" }
|
||||
|
||||
log = { workspace = true }
|
||||
env_logger = "0.11.2"
|
||||
|
@ -12,9 +12,9 @@ mod sync;
|
||||
#[cfg(feature = "sync")]
|
||||
mod account;
|
||||
|
||||
mod config;
|
||||
mod default_config;
|
||||
mod doctor;
|
||||
mod dotfiles;
|
||||
mod history;
|
||||
mod import;
|
||||
mod init;
|
||||
@ -54,7 +54,7 @@ pub enum Cmd {
|
||||
Store(store::Cmd),
|
||||
|
||||
#[command(subcommand)]
|
||||
Config(config::Cmd),
|
||||
Dotfiles(dotfiles::Cmd),
|
||||
|
||||
#[command()]
|
||||
Init(init::Cmd),
|
||||
@ -113,7 +113,7 @@ impl Cmd {
|
||||
|
||||
Self::Store(store) => store.run(&settings, &db, sqlite_store).await,
|
||||
|
||||
Self::Config(config) => config.run(&settings, sqlite_store).await,
|
||||
Self::Dotfiles(dotfiles) => dotfiles.run(&settings, sqlite_store).await,
|
||||
|
||||
Self::Init(init) => init.run(&settings).await,
|
||||
|
||||
|
@ -3,7 +3,7 @@ use eyre::{Context, Result};
|
||||
|
||||
use atuin_client::{encryption, record::sqlite_store::SqliteStore, settings::Settings};
|
||||
|
||||
use atuin_config::{shell::Alias, store::AliasStore};
|
||||
use atuin_dotfiles::{shell::Alias, store::AliasStore};
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
#[command(infer_subcommands = true)]
|
@ -1,7 +1,7 @@
|
||||
use std::path::PathBuf;
|
||||
|
||||
use atuin_client::{encryption, record::sqlite_store::SqliteStore, settings::Settings};
|
||||
use atuin_config::store::AliasStore;
|
||||
use atuin_dotfiles::store::AliasStore;
|
||||
use clap::{Parser, ValueEnum};
|
||||
use eyre::{Result, WrapErr};
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use atuin_config::store::AliasStore;
|
||||
use atuin_dotfiles::store::AliasStore;
|
||||
use eyre::Result;
|
||||
|
||||
pub async fn init(store: AliasStore, disable_up_arrow: bool, disable_ctrl_r: bool) -> Result<()> {
|
||||
@ -6,7 +6,7 @@ pub async fn init(store: AliasStore, disable_up_arrow: bool, disable_ctrl_r: boo
|
||||
|
||||
let aliases = store.aliases().await?;
|
||||
|
||||
let aliases = atuin_config::shell::bash::build(&aliases[..]);
|
||||
let aliases = atuin_dotfiles::shell::bash::build(&aliases[..]);
|
||||
|
||||
let (bind_ctrl_r, bind_up_arrow) = if std::env::var("ATUIN_NOBIND").is_ok() {
|
||||
(false, false)
|
||||
|
@ -1,4 +1,4 @@
|
||||
use atuin_config::store::AliasStore;
|
||||
use atuin_dotfiles::store::AliasStore;
|
||||
use eyre::Result;
|
||||
|
||||
pub async fn init(store: AliasStore, disable_up_arrow: bool, disable_ctrl_r: bool) -> Result<()> {
|
||||
@ -34,7 +34,7 @@ bind -M insert \e\[A _atuin_bind_up";
|
||||
}
|
||||
|
||||
let aliases = store.aliases().await?;
|
||||
let aliases = atuin_config::shell::fish::build(&aliases[..]);
|
||||
let aliases = atuin_dotfiles::shell::fish::build(&aliases[..]);
|
||||
|
||||
println!("{aliases}");
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use atuin_config::store::AliasStore;
|
||||
use atuin_dotfiles::store::AliasStore;
|
||||
use eyre::Result;
|
||||
|
||||
pub async fn init(store: AliasStore, disable_up_arrow: bool, disable_ctrl_r: bool) -> Result<()> {
|
||||
@ -20,7 +20,7 @@ pub async fn init(store: AliasStore, disable_up_arrow: bool, disable_ctrl_r: boo
|
||||
println!("{base}");
|
||||
|
||||
let aliases = store.aliases().await?;
|
||||
let aliases = atuin_config::shell::xonsh::build(&aliases[..]);
|
||||
let aliases = atuin_dotfiles::shell::xonsh::build(&aliases[..]);
|
||||
|
||||
println!("{aliases}");
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use atuin_config::store::AliasStore;
|
||||
use atuin_dotfiles::store::AliasStore;
|
||||
use eyre::Result;
|
||||
|
||||
pub async fn init(store: AliasStore, disable_up_arrow: bool, disable_ctrl_r: bool) -> Result<()> {
|
||||
@ -28,7 +28,7 @@ bindkey -M vicmd 'k' atuin-up-search-vicmd";
|
||||
}
|
||||
|
||||
let aliases = store.aliases().await?;
|
||||
let aliases = atuin_config::shell::zsh::build(&aliases[..]);
|
||||
let aliases = atuin_dotfiles::shell::zsh::build(&aliases[..]);
|
||||
|
||||
println!("{aliases}");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user