Change Config To Flag (#290)

This changes the `config` subcommand to a config flag.

Add option subcommand for now, for the clearing of default path.

Add `ZELLIJ_CONFIG` environment variable.

The configuration locations are now as follows:
    * `--config` flag
    * `ZELLIJ_CONFIG` environment variable
    * default config location
in that order.

1 files changed, 10 insertions, 4 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 43047dd3..008fb28c 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,6 +1,9 @@
 use std::path::PathBuf;
 use structopt::StructOpt;
 
+// TODO add to consts.rs
+const ZELLIJ_CONFIG_ENV: &str = "ZELLIJ_CONFIG";
+
 #[derive(StructOpt, Default, Debug)]
 #[structopt(name = "zellij")]
 pub struct CliArgs {
@@ -28,8 +31,12 @@ pub struct CliArgs {
     #[structopt(short, long)]
     pub layout: Option<PathBuf>,
 
+    /// Change where zellij looks for the configuration
+    #[structopt(short, long, env=ZELLIJ_CONFIG_ENV)]
+    pub config: Option<PathBuf>,
+
     #[structopt(subcommand)]
-    pub config: Option<ConfigCli>,
+    pub option: Option<ConfigCli>,
 
     #[structopt(short, long)]
     pub debug: bool,
@@ -37,10 +44,9 @@ pub struct CliArgs {
 
 #[derive(Debug, StructOpt)]
 pub enum ConfigCli {
-    /// Path to the configuration yaml file
-    #[structopt(alias = "c")]
+    /// Change the behaviour of zellij
+    #[structopt(name = "option")]
     Config {
-        path: Option<PathBuf>,
         #[structopt(long)]
         /// Disables loading of configuration file at default location
         clean: bool,