From 27d89b49e3cd3c83b9609a6ff9173a9b8d2d9ad4 Mon Sep 17 00:00:00 2001 From: Sinkerine <15cm.github@15cm.net> Date: Sat, 29 Apr 2023 02:08:16 -0700 Subject: [PATCH] zplug: Update the path of init.zsh (#3922) The current zplug nixpkgs puts everything under `$out/`. It pollutes the nix profile dir. This is a breaking change. It depends on an change of the output path in the nixpkgs zplug package. --- modules/programs/zplug.nix | 2 +- tests/modules/programs/zplug/modules.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/programs/zplug.nix b/modules/programs/zplug.nix index 7c731444..94e3173a 100644 --- a/modules/programs/zplug.nix +++ b/modules/programs/zplug.nix @@ -47,7 +47,7 @@ in { programs.zsh.initExtraBeforeCompInit = '' export ZPLUG_HOME=${cfg.zplugHome} - source ${pkgs.zplug}/init.zsh + source ${pkgs.zplug}/share/zplug/init.zsh ${optionalString (cfg.plugins != [ ]) '' ${concatStrings (map (plugin: '' diff --git a/tests/modules/programs/zplug/modules.nix b/tests/modules/programs/zplug/modules.nix index 9f4d4332..90b70f0b 100644 --- a/tests/modules/programs/zplug/modules.nix +++ b/tests/modules/programs/zplug/modules.nix @@ -29,7 +29,7 @@ with lib; nmt.script = '' assertFileContains home-files/.zshrc \ - 'source @zplug@/init.zsh' + 'source @zplug@/share/zplug/init.zsh' assertFileContains home-files/.zshrc \ 'zplug "plugins/git", from:oh-my-zsh'