thefuck: add instant mode option
Also do a slight code cleanup.
This commit is contained in:
parent
b3acf1dc78
commit
3e1f8df4f0
4 changed files with 48 additions and 11 deletions
|
|
@ -1,7 +1,8 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let cfg = config.programs.thefuck;
|
||||
in {
|
||||
|
||||
{
|
||||
meta.maintainers = [ hm.maintainers.ilaumjd ];
|
||||
|
||||
options.programs.thefuck = {
|
||||
|
|
@ -10,6 +11,8 @@ in {
|
|||
|
||||
package = mkPackageOption pkgs "thefuck" { };
|
||||
|
||||
enableInstantMode = mkEnableOption "thefuck's experimental instant mode";
|
||||
|
||||
enableBashIntegration = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
|
|
@ -27,15 +30,22 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = let
|
||||
cfg = config.programs.thefuck;
|
||||
|
||||
cliArgs = cli.toGNUCommandLineShell { } {
|
||||
alias = true;
|
||||
enable-experimental-instant-mode = cfg.enableInstantMode;
|
||||
};
|
||||
|
||||
shEvalCmd = ''
|
||||
eval "$(${cfg.package}/bin/thefuck ${cliArgs})"
|
||||
'';
|
||||
in mkIf cfg.enable {
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
|
||||
eval "$(${cfg.package}/bin/thefuck --alias)"
|
||||
'';
|
||||
programs.bash.initExtra = mkIf cfg.enableBashIntegration shEvalCmd;
|
||||
|
||||
programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
|
||||
eval "$(${cfg.package}/bin/thefuck --alias)"
|
||||
'';
|
||||
programs.zsh.initExtra = mkIf cfg.enableZshIntegration shEvalCmd;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue