From 293da4f33021c700fe1ee830e55b9c62ed6ba1c6 Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Thu, 3 Jul 2025 23:01:21 +0200
Subject: [PATCH] Cleanup

---
 build.rs   | 28 ++++------------------------
 flake.nix  |  6 +-----
 src/cli.rs |  4 +---
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/build.rs b/build.rs
index 2421fa1..2e95170 100644
--- a/build.rs
+++ b/build.rs
@@ -1,39 +1,19 @@
-use clap::{Command, CommandFactory};
-// use clap_complete as complete;
-use clap_mangen as mangen;
-// use complete::Shell;
-use std::{path::PathBuf, str::FromStr};
+use clap::CommandFactory;
+use clap_mangen::generate_to;
 
 #[path = "src/cli.rs"]
 mod cli;
 
 use cli::*;
 
-fn generate_manpage(cmd: Command, out_dir: PathBuf) -> std::io::Result<()> {
-    let _path = mangen::generate_to(cmd, &out_dir)?;
-    println!("cargo:warning=manpage is generated: {out_dir:?}");
-
-    Ok(())
-}
-
-// fn generate_completions(cmd: &mut Command, out_dir: PathBuf) -> std::io::Result<()> {
-//     let path = complete::generate_to(Shell::Zsh, cmd, "noise", out_dir)?;
-//     println!("cargo:warning=completion file is generated: {path:?}");
-//     Ok(())
-// }
-
 fn main() -> std::io::Result<()> {
     let out_dir =
         std::path::PathBuf::from(std::env::var_os("OUT_DIR").ok_or(std::io::ErrorKind::NotFound)?);
 
-    // let out_dir = PathBuf::from_str("./").unwrap();
-
     let cmd = Cli::command();
 
-    generate_manpage(cmd, out_dir.clone())?;
-
-    // eprintln!("{out_dir:?}");
-    // println!("cargo:warning=out_dir: {out_dir:?}");
+    generate_to(cmd, &out_dir)?;
+    println!("cargo:warning=OUT_DIR: {out_dir:?}");
 
     Ok(())
 }
diff --git a/flake.nix b/flake.nix
index 5c68f0d..291aef4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,10 +7,10 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       utils,
       naersk,
+      ...
     }:
     utils.lib.eachDefaultSystem (
       system:
@@ -32,10 +32,6 @@
           postInstall =
             with pkgs;
             lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-              # installShellCompletion --cmd noise \
-              #   --bash <($out/bin/fd --generate-completions bash) \
-              #   --fish <($out/bin/fd --generate-completions fish)
-              # installShellCompletion --zsh contrib/completion/_fd
               installShellCompletion --cmd noise \
                 --bash <($out/bin/noise --generate-completions bash) \
                 --zsh <($out/bin/noise --generate-completions zsh) \
diff --git a/src/cli.rs b/src/cli.rs
index 75d5400..d197c76 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -25,14 +25,12 @@ pub struct Cli {
     /// Generate shell completions
     #[arg(long = "generate-completions", value_enum)]
     pub completions: Option<Shell>,
-    // /// Generate manpage
-    // #[arg(long = "generate-manpage", value_enum)]
-    // pub manpage: bool,
 }
 
 #[derive(Subcommand, Debug, PartialEq)]
 pub enum Commands {
     /// Toggle MPD playback
+    #[command(visible_alias = "t")]
     Toggle,
     /// Skip to the next track
     #[command(visible_alias = "skip")]