nathan/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2026-06-05 21:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

atuin: precompute fish init script

Browse Source
This commit is contained in:
ketal
2026-05-05 06:53:01 +08:00
committed by Matthieu Coudron
parent 2f41903703
commit dcebe66f95
3 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/programs/atuin.nix
View File

@@ -166,6 +166,14 @@ in
config =
let
flagsStr = lib.escapeShellArgs cfg.flags;
atuinFishConfig =
pkgs.runCommand "atuin-fish-config.fish"
{
nativeBuildInputs = [ pkgs.writableTmpDirAsHomeHook ];
}
''
${lib.getExe cfg.package} init fish ${flagsStr} > "$out"
'';
in
mkIf cfg.enable (
lib.mkMerge [
@@ -212,7 +220,7 @@ in
'';
programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
${lib.getExe cfg.package} init fish ${flagsStr} | source
source ${atuinFishConfig}
'';
programs.nushell = mkIf cfg.enableNushellIntegration {

33
tests/modules/programs/atuin/fish.nix
View File

@@ -1,8 +1,24 @@
{ lib, ... }:
{ lib, pkgs, ... }:
let
atuinPackage = pkgs.writeShellScriptBin "atuin" ''
if [ "$1" = init ] && [ "$2" = fish ]; then
printf 'atuin fish init args:'
printf ' %s' "$@"
printf '\n'
else
echo "unexpected atuin invocation: $*" >&2
exit 1
fi
'';
in
{
programs = {
atuin.enable = true;
atuin = {
enable = true;
package = atuinPackage;
};
fish.enable = true;
};
@@ -13,8 +29,17 @@
nmt.script = ''
assertFileExists home-files/.config/fish/config.fish
assertFileContains \
assertFileRegex \
home-files/.config/fish/config.fish \
'@atuin@/bin/atuin init fish | source'
'source /nix/store/[^/]*-atuin-fish-config\.fish'
assertFileNotRegex home-files/.config/fish/config.fish 'atuin init fish'
atuinFishConfig=$(
sed -n 's|^[[:space:]]*source \(/nix/store/[^ ]*-atuin-fish-config\.fish\).*|\1|p' \
"$TESTED/home-files/.config/fish/config.fish" | head -n1
)
assertFileExists "$atuinFishConfig"
assertFileContains "$atuinFishConfig" \
'atuin fish init args: init fish'
'';
}

49
tests/modules/programs/atuin/set-flags.nix
View File

@@ -1,12 +1,28 @@
{ lib, ... }:
{ lib, pkgs, ... }:
let
atuinPackage = pkgs.writeShellScriptBin "atuin" ''
if [ "$1" = init ] && [ "$2" = fish ]; then
printf 'atuin fish init args:'
printf ' %s' "$@"
printf '\n'
else
echo "unexpected atuin invocation: $*" >&2
exit 1
fi
'';
in
{
programs = {
atuin.enable = true;
atuin.flags = [
"--disable-ctrl-r"
"--disable-up-arrow"
];
atuin = {
enable = true;
package = atuinPackage;
flags = [
"--disable-ctrl-r"
"--disable-up-arrow"
];
};
bash = {
enable = true;
enableCompletion = false;
@@ -22,17 +38,26 @@
nmt.script = ''
assertFileExists home-files/.bashrc
assertFileContains \
assertFileRegex \
home-files/.bashrc \
"eval \"\$(@atuin@/bin/atuin init bash --disable-ctrl-r --disable-up-arrow)\""
'eval "\$(/nix/store/[^/]*/bin/atuin init bash --disable-ctrl-r --disable-up-arrow)"'
assertFileExists home-files/.zshrc
assertFileContains \
assertFileRegex \
home-files/.zshrc \
"eval \"\$(@atuin@/bin/atuin init zsh --disable-ctrl-r --disable-up-arrow)\""
'eval "\$(/nix/store/[^/]*/bin/atuin init zsh --disable-ctrl-r --disable-up-arrow)"'
assertFileExists home-files/.config/fish/config.fish
assertFileContains \
assertFileRegex \
home-files/.config/fish/config.fish \
"@atuin@/bin/atuin init fish --disable-ctrl-r --disable-up-arrow | source"
'source /nix/store/[^/]*-atuin-fish-config\.fish'
assertFileNotRegex home-files/.config/fish/config.fish 'atuin init fish'
atuinFishConfig=$(
sed -n 's|^[[:space:]]*source \(/nix/store/[^ ]*-atuin-fish-config\.fish\).*|\1|p' \
"$TESTED/home-files/.config/fish/config.fish" | head -n1
)
assertFileExists "$atuinFishConfig"
assertFileContains "$atuinFishConfig" \
'atuin fish init args: init fish --disable-ctrl-r --disable-up-arrow'
'';
}