use from method and change path->output

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "nix begat oizys";
 
-  outputs = inputs:(import ./lib inputs).oizysFlake;
+  outputs = inputs: (import ./lib inputs).oizysFlake;
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";

hosts/othalan/system.nix

@@ -42,8 +42,12 @@ in {
 
   networking.hostName = "othalan";
   time.timeZone = "US/Central";
-  boot.loader = { 
+  boot.loader = {
-    systemd-boot ={ enable = true; consoleMode = "max";};
+    systemd-boot =
+      enabled
+      // {
+        consoleMode = "max";
+      };
     efi.canTouchEfiVariables = true;
   };
 

pkgs/oizys/oizys-rs/Cargo.lock

@@ -130,6 +130,15 @@ dependencies = [
  "strsim",
 ]
 
+[[package]]
+name = "clap_complete"
+version = "4.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
+dependencies = [
+ "clap",
+]
+
 [[package]]
 name = "clap_derive"
 version = "4.5.4"
@@ -372,6 +381,7 @@ name = "oizys"
 version = "0.1.0"
 dependencies = [
  "clap",
+ "clap_complete",
  "homedir",
  "hostname",
 ]

pkgs/oizys/oizys-rs/Cargo.toml

@@ -7,5 +7,6 @@ edition = "2021"
 
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
+clap_complete = "4.5.1"
 homedir = "0.2.1"
 hostname = "0.3.1"

pkgs/oizys/oizys-rs/default.nix

@@ -1,4 +1,7 @@
-{rustPlatform}:
+{
+  installShellFiles,
+  rustPlatform,
+}:
 rustPlatform.buildRustPackage {
   pname = "oizys";
   version = "unstable";
@@ -6,4 +9,11 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ./Cargo.lock;
   };
+
+  nativeBuildInputs = [installShellFiles];
+
+  postInstall = ''
+    installShellCompletion --cmd oizys \
+      --zsh <($out/bin/oizys --completions zsh)
+  '';
 }

pkgs/oizys/oizys-rs/src/main.rs

@@ -1,5 +1,6 @@
-use clap::{Parser, Subcommand};
+use clap::{CommandFactory, Parser, Subcommand};
-use std::{env, path::PathBuf, process::Command};
+use clap_complete::{generate, Generator, Shell};
+use std::{env, io, path::PathBuf, process::Command};
 
 #[derive(Parser)]
 #[command(version, about, long_about = None)]
@@ -20,8 +21,12 @@ struct Cli {
     #[arg(long, global=true, action = clap::ArgAction::SetTrue)]
     no_pinix: bool,
 
+    /// generate shell completion
+    #[arg(long, value_enum)]
+    completions: Option<Shell>,
+
     #[command(subcommand)]
-    command: Commands,
+    command: Option<Commands>,
 }
 
 #[derive(Debug, Subcommand)]
@@ -46,7 +51,11 @@ enum Commands {
     Build {},
 
     /// print nix flake output
-    Path {},
+    Output {},
+}
+
+fn print_completions<G: Generator>(gen: G, cmd: &mut clap::Command) {
+    generate(gen, cmd, cmd.get_name().to_string(), &mut io::stdout());
 }
 
 #[derive(Debug)]
@@ -58,19 +67,24 @@ struct Oizys {
 }
 
 impl Oizys {
-    fn new(host: Option<String>, flake: Option<PathBuf>, no_pinix: bool, verbose: u8) -> Oizys {
+    fn from(cli: &Cli) -> Oizys {
-        let hostname = hostname::get().unwrap().to_string_lossy().to_string();
+        let host = cli
-        let flake_path = env::var("OIZYS_DIR").map_or(
+            .host
+            .clone()
+            .unwrap_or(hostname::get().unwrap().to_string_lossy().to_string());
+        let flake = cli.flake.clone().unwrap_or(env::var("OIZYS_DIR").map_or(
             homedir::get_my_home().unwrap().unwrap().join("oizys"),
             PathBuf::from,
-        );
+        ));
+
         Oizys {
-            host: host.unwrap_or(hostname),
+            host,
-            flake: flake.unwrap_or(flake_path),
+            flake,
-            no_pinix,
+            no_pinix: cli.no_pinix,
-            verbose,
+            verbose: cli.verbose,
         }
     }
+
     fn output(self: &Oizys) -> String {
         format!(
             "{}#nixosConfigurations.{}.config.system.build.toplevel",
@@ -146,7 +160,14 @@ impl Oizys {
 
 fn main() {
     let cli = Cli::parse();
-    let oizys = Oizys::new(cli.host, cli.flake, cli.no_pinix, cli.verbose);
+    let oizys = Oizys::from(&cli);
+
+    if let Some(completions) = cli.completions {
+        let mut cmd = Cli::command();
+        eprintln!("Generating completion for {completions:?}");
+        print_completions(completions, &mut cmd);
+        std::process::exit(0);
+    }
 
     if oizys.verbose > 2 {
         println!("-vv is max verbosity")
@@ -155,12 +176,18 @@ fn main() {
         println!("{:?}", oizys)
     }
 
-    match &cli.command {
+    if let Some(command) = &cli.command {
-        Commands::Dry {} => oizys.build(true),
+        match command {
-        Commands::Build {} => oizys.build(false),
+            Commands::Dry {} => oizys.build(true),
-        Commands::Path {} => println!("{}", oizys.output()),
+            Commands::Build {} => oizys.build(false),
-        Commands::Boot {} => oizys.nixos_rebuild("boot"),
+            Commands::Output {} => println!("{}", oizys.output()),
-        Commands::Switch {} => oizys.nixos_rebuild("switch"),
+            Commands::Boot {} => oizys.nixos_rebuild("boot"),
-        Commands::Cache { name } => oizys.cache(name),
+            Commands::Switch {} => oizys.nixos_rebuild("switch"),
+            Commands::Cache { name } => oizys.cache(name),
+        }
+    } else {
+        eprintln!("No subcommand provided..");
+        let mut cmd = Cli::command();
+        cmd.print_help().unwrap();
     }
 }