diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2021-06-25 15:51:02 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2021-06-25 15:51:02 -0500 |
| commit | c3a929349f6c1968285ffff735933772be2f77cb (patch) | |
| tree | 0bfcfa57bf200461821a4239fe316a00f377a792 /misc | |
| parent | d5fd0f4745d834f7ac7049a0eb7e212ce9c7ef47 (diff) | |
| parent | bf68c693dc5157c2be1f3a9f407dd1ce3761df78 (diff) | |
Merge remote-tracking branch 'origin/master' into cross-jobs
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/launchd/org.nixos.nix-daemon.plist.in | 2 | ||||
| -rw-r--r-- | misc/zsh/completion.zsh | 4 | ||||
| -rw-r--r-- | misc/zsh/local.mk | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in index c334639e2..f1b439840 100644 --- a/misc/launchd/org.nixos.nix-daemon.plist.in +++ b/misc/launchd/org.nixos.nix-daemon.plist.in @@ -19,7 +19,7 @@ <array> <string>/bin/sh</string> <string>-c</string> - <string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon</string> + <string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon && exec /nix/var/nix/profiles/default/bin/nix-daemon</string> </array> <key>StandardErrorPath</key> <string>/var/log/nix-daemon.log</string> diff --git a/misc/zsh/completion.zsh b/misc/zsh/completion.zsh index d4df6447e..a902e37dc 100644 --- a/misc/zsh/completion.zsh +++ b/misc/zsh/completion.zsh @@ -1,3 +1,5 @@ +#compdef nix + function _nix() { local ifs_bk="$IFS" local input=("${(Q)words[@]}") @@ -18,4 +20,4 @@ function _nix() { _describe 'nix' suggestions } -compdef _nix nix +_nix "$@" diff --git a/misc/zsh/local.mk b/misc/zsh/local.mk new file mode 100644 index 000000000..418fb1377 --- /dev/null +++ b/misc/zsh/local.mk @@ -0,0 +1 @@ +$(eval $(call install-file-as, $(d)/completion.zsh, $(datarootdir)/zsh/site-functions/_nix, 0644)) |