mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge pull request #27578 from Ma27/bugfix/thefuck/support-for-non-posix-compliant-shells
programs.thefuck: support shells that don't use `/etc/profile`
This commit is contained in:
commit
12e8bea477
@ -3,7 +3,12 @@
|
|||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.programs.thefuck;
|
prg = config.programs;
|
||||||
|
cfg = prg.thefuck;
|
||||||
|
|
||||||
|
initScript = ''
|
||||||
|
eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
@ -24,8 +29,11 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [ thefuck ];
|
environment.systemPackages = with pkgs; [ thefuck ];
|
||||||
environment.shellInit = ''
|
environment.shellInit = initScript;
|
||||||
eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
|
|
||||||
|
programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
|
||||||
|
programs.fish.shellInit = mkIf prg.fish.enable ''
|
||||||
|
${pkgs.thefuck}/bin/thefuck --alias | source
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user