diff --git a/modules/apps.nix b/modules/apps.nix index b7df009..2e3249d 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -4,6 +4,12 @@ system, ... }: let + descriptions = { + apply = "Build and apply configuration"; + build = "Build configuration"; + build-switch = "Build and switch configuration"; + rollback = "Rollback to previous generation"; + }; mkApp = name: { type = "app"; program = "${(pkgs.writeShellScriptBin name '' @@ -11,6 +17,7 @@ echo "Running ${name} for ${system}" exec ${inputs.self}/apps/${system}/${name} "$@" '')}/bin/${name}"; + meta.description = descriptions.${name}; }; appNames = ["apply" "build" "build-switch" "rollback"]; in { @@ -20,6 +27,7 @@ deploy = { type = "app"; program = "${inputs.deploy-rs.packages.${system}.deploy-rs}/bin/deploy"; + meta.description = "Deploy to NixOS hosts via deploy-rs"; }; }; }; diff --git a/modules/nixos-system.nix b/modules/nixos-system.nix index 52a7587..f5a149e 100644 --- a/modules/nixos-system.nix +++ b/modules/nixos-system.nix @@ -23,10 +23,18 @@ command = "/nix/store/*/bin/activate-rs"; options = ["NOPASSWD"]; } + { + command = "/nix/store/*/activate-rs"; + options = ["NOPASSWD"]; + } { command = "/nix/store/*/bin/wait-activate"; options = ["NOPASSWD"]; } + { + command = "/nix/store/*/wait-activate"; + options = ["NOPASSWD"]; + } ]; } ];