Skip to content

Commit

Permalink
Merge branch 'mrj/nix-flake-overlay' of github.com:1Password/shell-pl…
Browse files Browse the repository at this point in the history
…ugins into mrj/nix-flake-overlay
  • Loading branch information
mrjones2014 committed Mar 6, 2024
2 parents 13a3b13 + 5ece816 commit e909e4b
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions nix/shell-plugins.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,16 @@ in {
zsh.shellAliases = aliases;
fish.shellAliases = aliases;
};
} // optionalAttrs is-home-manager { home.packages = packages; }
// optionalAttrs (!is-home-manager) {
environment.systemPackages = packages;
})
} // optionalAttrs is-home-manager {
home = {
inherit packages;
sessionVariables = { OP_PLUGINS_SOURCED = "1"; };
};
} // optionalAttrs (!is-home-manager) {
environment = {
systemPackages = packages;
variables = { OP_PLUGINS_SOURCED = "1"; };
};
})
]);
}

0 comments on commit e909e4b

Please sign in to comment.