Skip to content

Commit

Permalink
pay-respects: add module
Browse files Browse the repository at this point in the history
Add pay-respects module including shell integration support for bash,
zsh, fish and nushell.
  • Loading branch information
ALameLlama authored and rycee committed Dec 21, 2024
1 parent 99f54cd commit db9a98e
Show file tree
Hide file tree
Showing 8 changed files with 138 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules/lib/maintainers.nix
Original file line number Diff line number Diff line change
Expand Up @@ -628,4 +628,10 @@
keys =
[{ fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; }];
};
ALameLlama = {
name = "Nicholas Ciechanowski";
email = "[email protected]";
github = "ALameLlama";
githubId = 55490546;
};
}
10 changes: 10 additions & 0 deletions modules/misc/news.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1899,6 +1899,16 @@ in {
registry with the option 'programs.nushell.plugins'.
'';
}

{
time = "2024-12-21T17:07:49+00:00";
message = ''
A new module is available: 'programs.pay-respects'.
Pay Respects is a shell command suggestions tool and command-not-found
and thefuck replacement written in Rust.
'';
}
];
};
}
1 change: 1 addition & 0 deletions modules/modules.nix
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ let
./programs/pandoc.nix
./programs/papis.nix
./programs/password-store.nix
./programs/pay-respects.nix
./programs/pazi.nix
./programs/pet.nix
./programs/pidgin.nix
Expand Down
61 changes: 61 additions & 0 deletions modules/programs/pay-respects.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkEnableOption mkPackageOption getExe optionalString mkIf;

cfg = config.programs.pay-respects;
payRespectsCmd = getExe cfg.package;
in {
meta.maintainers = [ lib.hm.maintainers.ALameLlama ];

options.programs.pay-respects = {
enable = mkEnableOption "pay-respects";

package = mkPackageOption pkgs "pay-respects" { };

enableBashIntegration = mkEnableOption "Bash integration" // {
default = true;
};

enableZshIntegration = mkEnableOption "Zsh integration" // {
default = true;
};

enableFishIntegration = mkEnableOption "Fish integration" // {
default = true;
};

enableNushellIntegration = mkEnableOption "Nushell integration" // {
default = true;
};
};

config = mkIf cfg.enable {
home.packages = [ cfg.package ];

programs = {
bash.initExtra = ''
${optionalString cfg.enableBashIntegration ''
eval "$(${payRespectsCmd} bash --alias)"
''}
'';

zsh.initExtra = ''
${optionalString cfg.enableZshIntegration ''
eval "$(${payRespectsCmd} zsh --alias)"
''}
'';

fish.interactiveShellInit = ''
${optionalString cfg.enableFishIntegration ''
${payRespectsCmd} fish --alias | source
''}
'';

nushell.extraConfig = ''
${optionalString cfg.enableNushellIntegration ''
${payRespectsCmd} nushell --alias [<alias>]
''}
'';
};
};
}
1 change: 1 addition & 0 deletions tests/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ in import nmtSrc {
./modules/programs/openstackclient
./modules/programs/pandoc
./modules/programs/papis
./modules/programs/pay-respects
./modules/programs/pet
./modules/programs/pistol
./modules/programs/pls
Expand Down
4 changes: 4 additions & 0 deletions tests/modules/programs/pay-respects/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
pay-respects-integration-enabled = ./integration-enabled.nix;
pay-respects-integration-disabled = ./integration-disabled.nix;
}
22 changes: 22 additions & 0 deletions tests/modules/programs/pay-respects/integration-disabled.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ ... }: {
programs = {
pay-respects.enable = true;
pay-respects.enableBashIntegration = false;
pay-respects.enableFishIntegration = false;
pay-respects.enableZshIntegration = false;
pay-respects.enableNushellIntegration = false;
bash.enable = true;
zsh.enable = true;
fish.enable = true;
nushell.enable = true;
};

test.stubs.pay-respects = { };

nmt.script = ''
assertFileNotRegex home-files/.bashrc '@pay-respects@/bin/dummy'
assertFileNotRegex home-files/.zshrc '@pay-respects@/bin/dummy'
assertFileNotRegex home-files/.config/fish/config.fish '@pay-respects@/bin/dummy'
assertFileNotRegex home-files/.config/nushell/config.nu '@pay-respects@/bin/dummy'
'';
}
33 changes: 33 additions & 0 deletions tests/modules/programs/pay-respects/integration-enabled.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ ... }: {
programs = {
pay-respects.enable = true;
bash.enable = true;
zsh.enable = true;
fish.enable = true;
nushell.enable = true;
};

test.stubs.pay-respects = { };

nmt.script = ''
assertFileExists home-files/.bashrc
assertFileContains \
home-files/.bashrc \
'eval "$(@pay-respects@/bin/dummy bash --alias)"'
assertFileExists home-files/.zshrc
assertFileContains \
home-files/.zshrc \
'eval "$(@pay-respects@/bin/dummy zsh --alias)"'
assertFileExists home-files/.config/fish/config.fish
assertFileContains \
home-files/.config/fish/config.fish \
'@pay-respects@/bin/dummy fish --alias | source'
assertFileExists home-files/.config/nushell/config.nu
assertFileContains \
home-files/.config/nushell/config.nu \
'@pay-respects@/bin/dummy nushell --alias [<alias>]'
'';
}

0 comments on commit db9a98e

Please sign in to comment.