From abd9a7c2feb1034bdc217b75c7b5ea024560d8a1 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 20 Jan 2018 01:32:33 +0100 Subject: zsh: remove shell wrapper --- modules/programs/zsh/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'modules/programs') diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index ee22a2b..6e84389 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -11,15 +11,6 @@ let fzfCompletion = ./fzf-completion.zsh; fzfGit = ./fzf-git.zsh; fzfHistory = ./fzf-history.zsh; - - shell = pkgs.runCommand pkgs.zsh.name - { buildInputs = [ pkgs.makeWrapper ]; } - '' - source $stdenv/setup - - mkdir -p $out/bin - makeWrapper ${pkgs.zsh}/bin/zsh $out/bin/zsh - ''; in { @@ -114,8 +105,8 @@ in environment.pathsToLink = [ "/share/zsh" ]; - environment.loginShell = "${shell}/bin/zsh -l"; - environment.variables.SHELL = "${shell}/bin/zsh"; + environment.loginShell = "zsh -l"; + environment.variables.SHELL = "${pkgs.zsh}/bin/zsh"; environment.etc."zshenv".text = '' # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically. -- cgit v1.2.3