mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 15:56:50 +01:00
Merge pull request #171152 from Luflosi/thefuck-improvements
nixos/thefuck: fix programs.thefuck.alias for fish
This commit is contained in:
commit
c8bbc62a64
1 changed files with 7 additions and 6 deletions
|
@ -6,9 +6,12 @@ let
|
|||
prg = config.programs;
|
||||
cfg = prg.thefuck;
|
||||
|
||||
initScript = ''
|
||||
bashAndZshInitScript = ''
|
||||
eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
|
||||
'';
|
||||
fishInitScript = ''
|
||||
${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source
|
||||
'';
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
@ -30,10 +33,8 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [ thefuck ];
|
||||
|
||||
programs.bash.interactiveShellInit = initScript;
|
||||
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
|
||||
programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
|
||||
${pkgs.thefuck}/bin/thefuck --alias | source
|
||||
'';
|
||||
programs.bash.interactiveShellInit = bashAndZshInitScript;
|
||||
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;
|
||||
programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue