From 491f74db894b5c5843a9e4b123aa773e1b21583f Mon Sep 17 00:00:00 2001 From: hitsmaxft Date: Fri, 23 Jun 2023 11:14:48 +0800 Subject: [PATCH] antidote: fix package source path Changes 'source %antidote%/antidote.zsh' to 'source %antidote%/share/antidote/antidote.zsh' --- modules/programs/antidote.nix | 2 +- tests/modules/programs/antidote/antidote.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/programs/antidote.nix b/modules/programs/antidote.nix index 0120f4e8..a26c4792 100644 --- a/modules/programs/antidote.nix +++ b/modules/programs/antidote.nix @@ -39,7 +39,7 @@ in { ### move zsh_plugins.txt programs.zsh.initExtraBeforeCompInit = '' ## home-manager/antidote begin : - source ${cfg.package}/antidote.zsh + source ${cfg.package}/share/antidote/antidote.zsh ${optionalString cfg.useFriendlyNames "zstyle ':antidote:bundle' use-friendly-names 'yes'"} bundlefile=${relToDotDir ".zsh_plugins.txt"} diff --git a/tests/modules/programs/antidote/antidote.nix b/tests/modules/programs/antidote/antidote.nix index 826ffe5a..04ba6dd5 100644 --- a/tests/modules/programs/antidote/antidote.nix +++ b/tests/modules/programs/antidote/antidote.nix @@ -1,7 +1,6 @@ -{ ... }: +{ pkgs, ... }: let relToDotDirCustom = ".zshplugins"; - in { programs.zsh = { enable = true; @@ -20,7 +19,7 @@ in { nmt.script = '' assertFileContains home-files/${relToDotDirCustom}/.zshrc \ - 'source @antidote@/antidote.zsh' + 'source @antidote@/share/antidote/antidote.zsh' assertFileContains home-files/${relToDotDirCustom}/.zshrc \ 'antidote load' assertFileContains home-files/${relToDotDirCustom}/.zshrc \