b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #171152 from Luflosi/thefuck-improvements

Browse source 
nixos/thefuck: fix programs.thefuck.alias for fish
This commit is contained in:
Artturi 2022-05-04 05:32:40 +03:00 committed by GitHub
parent cdeb8f5bb5 536a78ecc9
commit c8bbc62a64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/programs/thefuck.nix
View file

@ -6,9 +6,12 @@ let
prg = config.programs; prg = config.programs;
cfg = prg.thefuck; cfg = prg.thefuck;
initScript = '' bashAndZshInitScript = ''
eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias}) eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
''; '';
fishInitScript = ''
${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source
'';
in in
{ {
options = { options = {
@ -30,10 +33,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ thefuck ]; environment.systemPackages = with pkgs; [ thefuck ];
programs.bash.interactiveShellInit = initScript; programs.bash.interactiveShellInit = bashAndZshInitScript;
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript; programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;
programs.fish.interactiveShellInit = mkIf prg.fish.enable '' programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;
${pkgs.thefuck}/bin/thefuck --alias | source
'';
}; };
} }