nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

zsh: format module with nixpkgs-fmt

Browse Source
This commit is contained in:
Timothy DeHerrera 2021-06-29 14:31:10 -06:00
parent d687fe88fd
commit 9ad645dce8
No known key found for this signature in database
GPG Key ID: 19B7285E0F84A536
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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 = ''
@ -279,14 +281,18 @@ in
environment.etc.zinputrc.source = ./zinputrc; environment.etc.zinputrc.source = ./zinputrc;
environment.systemPackages = [ pkgs.zsh ] environment.systemPackages = [ pkgs.zsh ]
++ optional (cfg.enableCompletion && ! lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") pkgs.nix-zsh-completions; ++ optional
(cfg.enableCompletion
&& !lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre")
pkgs.nix-zsh-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"
]; ];