Start refactor for 4.0 and support installables

viperML · Nov 17, 2024 · 4ab65f4 · 4ab65f4
1 parent ed21160
commit 4ab65f4
Show file tree

Hide file tree

Showing 17 changed files with 520 additions and 682 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,11 @@
 [package]
 name = "nh"
-version = "3.6.0"
+version = "4.0.0-alpha.1"
 edition = "2021"
 license = "EUPL-1.2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ambassador = "0.4.0"
 anstyle = "1.0.0"
 clap = { version = "4.0", features = [
     "cargo",
@@ -21,7 +20,6 @@ clean-path = "0.2"
 color-eyre = { version = "0.6.2", default-features = false, features = [
     "track-caller",
 ] }
-derive_builder = "0.20.0"
 dialoguer = { version = "0.11.0", default-features = false }
 elasticsearch-dsl = "0.4.19"
 hostname = "0.4"

diff --git a/flake.nix b/flake.nix
@@ -34,7 +34,5 @@
     devShells = forAllSystems (pkgs: {
       default = pkgs.callPackage ./devshell.nix {};
     });
-
-    nixosModules.default = import ./module.nix;
   };
 }
diff --git a/module.nix b/module.nix
diff --git a/package.nix b/package.nix
@@ -43,9 +43,9 @@ in
 
     preFixup = ''
       mkdir completions
-      $out/bin/nh completions --shell bash > completions/nh.bash
-      $out/bin/nh completions --shell zsh > completions/nh.zsh
-      $out/bin/nh completions --shell fish > completions/nh.fish
+      $out/bin/nh completions bash > completions/nh.bash
+      $out/bin/nh completions zsh > completions/nh.zsh
+      $out/bin/nh completions fish > completions/nh.fish
 
       installShellCompletion completions/*
     '';