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: 2cee0c41e467
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85b1312b0785
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 21, 2018

  1. nixos/thefuck: move init scripts to programs.*.interactiveShellInit 

    `fuck` should only be used for interactive sessions, but nothing more
(so init files like `/etc/zshenv` become even more lightweight).
    @Ma27
    Ma27 committed Jun 21, 2018
    Copy the full SHA
    6c66e15 View commit details

Commits on Jun 22, 2018

  1. Merge pull request #42356 from Ma27/fix-thefuck-module 

    nixos/thefuck: move init scripts to `programs.*.interactiveShellInit`
    @Mic92
    Mic92 authored Jun 22, 2018
    Copy the full SHA
    85b1312 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/programs/thefuck.nix
4 changes: 2 additions & 2 deletions nixos/modules/programs/thefuck.nix
View file
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ in
environment.systemPackages = with pkgs; [ thefuck ];
environment.shellInit = initScript;

programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
programs.fish.shellInit = mkIf prg.fish.enable ''
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
${pkgs.thefuck}/bin/thefuck --alias | source
'';
};