Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: df2696c4305a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 605eb4098fc0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 3, 2018

  1. nixos/thefuck: don't run thefuck on `environment.shellInit' 

    The init script slightly differs depending on which shell is in use.
So for bash it should be in the interactiveShellInit as well.

In this case we don't need a mkIf as `bash` is enabled by default
on NixOS.
    @Ma27
    Ma27 committed Oct 3, 2018
    Copy the full SHA
    bccd0fa View commit details

Commits on Oct 13, 2018

  1. Merge pull request #47696 from Ma27/dont-run-thefuck-on-bash 

    nixos/thefuck: don't run thefuck on `environment.shellInit'
    @lukateras
    lukateras authored Oct 13, 2018
    Copy the full SHA
    605eb40 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/programs/thefuck.nix
2 changes: 1 addition & 1 deletion nixos/modules/programs/thefuck.nix
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ in

config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ thefuck ];
environment.shellInit = initScript;

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