mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Code Issues Wiki Activity

Merge pull request #128649 from nrdxp/fix-unstable-nix-zsh-completions

Browse source 
zsh: fix nixUnstable completions
This commit is contained in:
Maximilian Bosch 2021-07-22 14:58:20 +02:00 committed by GitHub
parent f102bcee7d 6dbf8c0409
commit 15dab3835f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nixos/modules/programs/zsh/zsh.nix
View file

@ -53,7 +53,7 @@ in
}; };
shellAliases = mkOption { shellAliases = mkOption {
default = {}; default = { };
description = '' description = ''
Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>. Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>.
See <option>environment.shellAliases</option> for an option format description. See <option>environment.shellAliases</option> for an option format description.
@ -118,7 +118,9 @@ in
setOptions = mkOption { setOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ default = [
"HIST_IGNORE_DUPS" "SHARE_HISTORY" "HIST_FCNTL_LOCK" "HIST_IGNORE_DUPS"
"SHARE_HISTORY"
"HIST_FCNTL_LOCK"
]; ];
example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ]; example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ];
description = '' description = ''
@ -278,15 +280,29 @@ in
environment.etc.zinputrc.source = ./zinputrc; environment.etc.zinputrc.source = ./zinputrc;
environment.systemPackages = [ pkgs.zsh ] environment.systemPackages =
++ optional cfg.enableCompletion pkgs.nix-zsh-completions; let
completions =
if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
then
pkgs.nix-zsh-completions.overrideAttrs
(_: {
postInstall = ''
rm $out/share/zsh/site-functions/_nix
'';
})
else pkgs.nix-zsh-completions;
in
[ pkgs.zsh ]
++ optional cfg.enableCompletion completions;
environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh";
#users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh";
environment.shells = environment.shells =
[ "/run/current-system/sw/bin/zsh" [
"/run/current-system/sw/bin/zsh"
"${pkgs.zsh}/bin/zsh" "${pkgs.zsh}/bin/zsh"
]; ];