Compare commits
No commits in common. "37b3fc8b4fdf1e4225c31c41f7205108f5f4bf6f" and "f5c88077f8b96cbbdccceb0c13179d6a87f45b71" have entirely different histories.
37b3fc8b4f
...
f5c88077f8
|
@ -18,7 +18,6 @@
|
|||
|
||||
userdata/
|
||||
trinitrix.log
|
||||
plugin.txt
|
||||
|
||||
# build
|
||||
/target
|
||||
|
@ -30,9 +29,6 @@ plugin.txt
|
|||
.idea
|
||||
.direnv
|
||||
|
||||
# Pre Commit hooks
|
||||
.pre-commit-config.yaml
|
||||
|
||||
# LS
|
||||
## lua
|
||||
.luarc.json
|
||||
|
|
54
flake.lock
54
flake.lock
|
@ -56,58 +56,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"gitignore": [
|
||||
"gitignore"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714478972,
|
||||
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "2849da033884f54822af194400f8dff435ada242",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1714656196,
|
||||
|
@ -129,8 +77,6 @@
|
|||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"git-hooks": "git-hooks",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rust-overlay": "rust-overlay",
|
||||
"systems": "systems",
|
||||
|
|
25
flake.nix
25
flake.nix
|
@ -34,16 +34,6 @@
|
|||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
git-hooks = {
|
||||
url = "github:cachix/git-hooks.nix";
|
||||
inputs = {
|
||||
flake-compat.follows = "flake-compat";
|
||||
flake-utils.follows = "flake-utils";
|
||||
gitignore.follows = "gitignore";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs-stable.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
rust-overlay = {
|
||||
url = "github:oxalica/rust-overlay";
|
||||
inputs = {
|
||||
|
@ -53,12 +43,6 @@
|
|||
};
|
||||
|
||||
# inputs for following
|
||||
gitignore = {
|
||||
url = "github:hercules-ci/gitignore.nix";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
systems = {
|
||||
url = "github:nix-systems/x86_64-linux"; # only evaluate for this system
|
||||
};
|
||||
|
@ -78,7 +62,6 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
flake-utils,
|
||||
git-hooks,
|
||||
treefmt-nix,
|
||||
crane,
|
||||
rust-overlay,
|
||||
|
@ -158,19 +141,11 @@
|
|||
checks = {
|
||||
inherit craneBuild;
|
||||
formatting = treefmtEval.config.build.check self;
|
||||
pre-commit = git-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks.treefmt = {
|
||||
enable = true;
|
||||
package = treefmtEval.config.build.wrapper;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
formatter = treefmtEval.config.build.wrapper;
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
inherit (self.checks.${system}.pre-commit) shellHook;
|
||||
packages = with pkgs; [
|
||||
cocogitto
|
||||
|
||||
|
|
10
src/cli.rs
10
src/cli.rs
|
@ -24,11 +24,11 @@ use clap::{Parser, Subcommand};
|
|||
|
||||
/// A multi protocol chat client
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(author, version, about, long_about = None, arg_required_else_help(true))]
|
||||
#[command(author, version, about, long_about = None)]
|
||||
pub struct Args {
|
||||
#[command(subcommand)]
|
||||
/// The subcommand to execute, default is help
|
||||
pub subcommand: Command,
|
||||
/// The subcommand to execute, default is start
|
||||
pub subcommand: Option<Command>,
|
||||
|
||||
// #[arg(long, short)]
|
||||
// /// Path to the Lua config file, executed instead of the normal one
|
||||
|
@ -39,8 +39,8 @@ pub struct Args {
|
|||
}
|
||||
#[derive(Subcommand, Debug)]
|
||||
pub enum Command {
|
||||
/// Starts a TUI client
|
||||
Tui {},
|
||||
/// Starts the main TUI client
|
||||
Start {},
|
||||
|
||||
/// Starts a repl to the trinitry cli interpreter
|
||||
Repl {},
|
||||
|
|
11
src/main.rs
11
src/main.rs
|
@ -35,8 +35,15 @@ async fn main() -> anyhow::Result<()> {
|
|||
cli_log::init_cli_log!();
|
||||
|
||||
let args = Args::parse();
|
||||
match args.subcommand {
|
||||
Command::Tui {} => {}
|
||||
let command = args.subcommand.unwrap_or(Command::Start {});
|
||||
match command {
|
||||
Command::Start {} => {
|
||||
todo!("The full ui is not yet finished");
|
||||
let mut app = app::App::new(Repl::new()?)?;
|
||||
|
||||
// NOTE(@soispha): The `None` here is temporary <2024-05-03>
|
||||
app.run(None, args.plugin_path).await?;
|
||||
}
|
||||
Command::Repl {} => {
|
||||
let mut app = app::App::new(Repl::new().context("Failed to setup repl")?)?;
|
||||
|
||||
|
|
Reference in New Issue