Skip to content

Pass args to plugin shell functions #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrjones2014 merged 3 commits into from
Aug 27, 2025
Merged

Pass args to plugin shell functions #545

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
821d07e
add args to shell functions and programs fish
BJSummerfield Aug 26, 2025
6be39d6
Merge branch 'main' into bjs/fish-plugins
BJSummerfield Aug 26, 2025
fc45441
add fish to host configs
BJSummerfield Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 51 additions & 57 deletions nix/shell-plugins.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
pkgs,
lib,
config,
is-home-manager,
...
}:
{ pkgs, lib, config, is-home-manager, ... }:
with lib;
let
cfg = config.programs._1password-shell-plugins;
Expand Down Expand Up @@ -50,13 +44,15 @@ in
# for which the executable has a supported 1Password Shell Plugin
apply =
package_list:
map (
package:
if (elem (getExeName package) supported_plugins) then
package
else
abort "${getExeName package} is not a valid 1Password Shell Plugin. A list of supported plugins can be found by running `op plugin list` or at: https://developer.1password.com/docs/cli/shell-plugins/"
) package_list;
map
(
package:
if (elem (getExeName package) supported_plugins) then
package
else
abort "${getExeName package} is not a valid 1Password Shell Plugin. A list of supported plugins can be found by running `op plugin list` or at: https://developer.1password.com/docs/cli/shell-plugins/"
)
package_list;
};
};
};
Expand Down Expand Up @@ -84,51 +80,49 @@ in
# end
# ```
# where `{pkg}` is the executable name of the package
posixFunctions = map (package: ''
${package}() {
op plugin run -- ${package};
}
'') pkg-exe-names;
fishFunctions = map (package: ''
function ${package} --wraps "${package}" --description "1Password Shell Plugin for ${package}"
op plugin run -- ${package}
end
'') pkg-exe-names;
posixFunctions = map
(package: ''
${package}() {
op plugin run -- ${package} "$@";
}
'')
pkg-exe-names;
fishFunctions = map
(package: ''
function ${package} --wraps "${package}" --description "1Password Shell Plugin for ${package}"
op plugin run -- ${package} $argv
end
'')
pkg-exe-names;
packages = lib.optional (cfg.package != null) cfg.package ++ cfg.plugins;
in
mkIf cfg.enable (mkMerge [
(
{
# for Fish its the same option path between NixOS vs. home-manager
fish.interactiveShellInit = strings.concatStringsSep "\n" fishFunctions;
}
// optionalAttrs is-home-manager {
programs = {
# for the Bash and Zsh home-manager modules,
# the initExtra option is equivalent to Fish's interactiveShellInit
bash.initExtra = strings.concatStringsSep "\n" posixFunctions;
zsh.initExtra = strings.concatStringsSep "\n" posixFunctions;
};
home = {
inherit packages;
sessionVariables = {
OP_PLUGINS_SOURCED = "1";
};
};
}
// optionalAttrs (!is-home-manager) {
programs = {
bash.interactiveShellInit =
strings.concatStringsSep "\n" posixFunctions;
zsh.interactiveShellInit = strings.concatStringsSep "\n" posixFunctions;
};
environment = {
systemPackages = packages;
variables = {
OP_PLUGINS_SOURCED = "1";
};
};
}
)
{
programs.fish.interactiveShellInit = strings.concatStringsSep "\n" fishFunctions;
}
(optionalAttrs is-home-manager {
programs = {
# for the Bash and Zsh home-manager modules,
# the initExtra option is equivalent to Fish's interactiveShellInit
bash.initExtra = strings.concatStringsSep "\n" posixFunctions;
zsh.initExtra = strings.concatStringsSep "\n" posixFunctions;
};
home = {
inherit packages;
sessionVariables = { OP_PLUGINS_SOURCED = "1"; };
};
})
(optionalAttrs (!is-home-manager) {
programs = {
bash.interactiveShellInit =
strings.concatStringsSep "\n" posixFunctions;
zsh.interactiveShellInit = strings.concatStringsSep "\n" posixFunctions;
};
environment = {
systemPackages = packages;
variables = { OP_PLUGINS_SOURCED = "1"; };
};
})
]);
}

Loading