Merge pull request #861 from thanegill/darwin-rebuild-completions

Add zsh completions to darwin-rebuld by default

modules/examples/lnl.nix

@@ -308,40 +308,6 @@
 
   nixpkgs.overlays = [
     (self: super: {
-      darwin-zsh-completions = super.runCommand "darwin-zsh-completions-0.0.0"
-        { preferLocalBuild = true; }
-        ''
-          mkdir -p $out/share/zsh/site-functions
-
-          cat <<-'EOF' > $out/share/zsh/site-functions/_darwin-rebuild
-          #compdef darwin-rebuild
-          #autoload
-
-          _nix-common-options
-
-          local -a _1st_arguments
-          _1st_arguments=(
-            'switch:Build, activate, and update the current generation'\
-            'build:Build without activating or updating the current generation'\
-            'check:Build and run the activation sanity checks'\
-            'changelog:Show most recent entries in the changelog'\
-          )
-
-          _arguments \
-            '--list-generations[Print a list of all generations in the active profile]'\
-            '--rollback[Roll back to the previous configuration]'\
-            {--switch-generation,-G}'[Activate specified generation]'\
-            '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\
-            '1:: :->subcmds' && return 0
-
-          case $state in
-            subcmds)
-              _describe -t commands 'darwin-rebuild subcommands' _1st_arguments
-            ;;
-          esac
-          EOF
-        '';
-
       vim_configurable = super.vim_configurable.override {
         guiSupport = "no";
       };

pkgs/nix-tools/darwin-rebuild.zsh-completions

@@ -0,0 +1,38 @@
+#compdef darwin-rebuild
+#autoload
+
+_nix-common-options
+
+local -a _1st_arguments
+_1st_arguments=(
+  'edit:Open nix-darwin config in $EDITOR'\
+  'switch:Build, activate, and update the current generation'\
+  'activate:Activate an already built store path and update the current generation'\
+  'build:Build without activating or updating the current generation'\
+  'check:Build and run the activation sanity checks'\
+  'changelog:Show most recent entries in the changelog'\
+)
+
+_arguments \
+  $__nix_search_path_args\
+  '(--verbose -v)*'{--verbose,-v}'[Increase verbosity of diagnostic messages]'\
+  '(--max-jobs -j)'{--max-jobs,-j}'[max number of build jobs in parallel]:jobs:'\
+  '--cores[threads per job (e.g. -j argument to make)]:cores:'\
+  '(--keep-going -k)'{--keep-going,-k}"[keep going until all builds are finished]"\
+  '(--keep-failed -K)'{--keep-failed,-K}'[keep failed builds (usually in /tmp)]'\
+  '--fallback[If binary download fails, fall back on building from source]'\
+  '--show-trace[Print stack trace of evaluation errors]'\
+  '*--option[set Nix configuration option]:options:_nix_options:value:_nix_options_value'\
+  '*--arg[argument to pass to the Nix function]:Name:_nix_complete_function_arg:Value: '\
+  '*--argstr[pass a string]:Name:_nix_complete_function_arg:String: '\
+  '--list-generations[Print a list of all generations in the active profile]'\
+  '--rollback[Roll back to the previous configuration]'\
+  {--switch-generation,-G}'[Activate specified generation]'\
+  '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\
+  '1:: :->subcmds' && return 0
+
+case $state in
+  subcmds)
+    _describe -t commands 'darwin-rebuild subcommands' _1st_arguments
+  ;;
+esac

pkgs/nix-tools/default.nix

@@ -33,6 +33,10 @@ in
     {
       inherit path profile;
       inherit (stdenv) shell;
+      postInstall = ''
+        mkdir -p $out/share/zsh/site-functions
+        cp ${./darwin-rebuild.zsh-completions} $out/share/zsh/site-functions/_darwin-rebuild
+      '';
     }
     ./darwin-rebuild.sh;