diff --git a/tests/modules/programs/kakoune/default.nix b/tests/modules/programs/kakoune/default.nix index cb9f05afd..1e6e077df 100644 --- a/tests/modules/programs/kakoune/default.nix +++ b/tests/modules/programs/kakoune/default.nix @@ -1,8 +1,6 @@ { kakoune-no-plugins = ./no-plugins.nix; - # Temporarily disabled until https://github.com/NixOS/nixpkgs/pull/110196 - # reaches the unstable channel. - # kakoune-use-plugins = ./use-plugins.nix; + kakoune-use-plugins = ./use-plugins.nix; kakoune-whitespace-highlighter = ./whitespace-highlighter.nix; kakoune-whitespace-highlighter-corner-cases = ./whitespace-highlighter-corner-cases.nix; diff --git a/tests/modules/programs/kakoune/no-plugins.nix b/tests/modules/programs/kakoune/no-plugins.nix index 67a7f30f5..d1505751b 100644 --- a/tests/modules/programs/kakoune/no-plugins.nix +++ b/tests/modules/programs/kakoune/no-plugins.nix @@ -3,11 +3,11 @@ with lib; { - config = { - programs.kakoune = { enable = true; }; + imports = [ ./stubs.nix ]; - nmt.script = '' - assertPathNotExists home-path/share/kak/autoload/plugins - ''; - }; + programs.kakoune = { enable = true; }; + + nmt.script = '' + assertPathNotExists home-path/share/kak/autoload/plugins + ''; } diff --git a/tests/modules/programs/kakoune/stubs.nix b/tests/modules/programs/kakoune/stubs.nix new file mode 100644 index 000000000..28a816418 --- /dev/null +++ b/tests/modules/programs/kakoune/stubs.nix @@ -0,0 +1,12 @@ +{ + test.stubs.kakoune-unwrapped = { + name = "dummy-kakoune"; + version = "1"; + outPath = null; + buildScript = '' + mkdir -p $out/bin $out/share/kak/doc + touch $out/bin/kak + chmod +x $out/bin/kak + ''; + }; +} diff --git a/tests/modules/programs/kakoune/use-plugins.nix b/tests/modules/programs/kakoune/use-plugins.nix index 9d4448327..de7b3a123 100644 --- a/tests/modules/programs/kakoune/use-plugins.nix +++ b/tests/modules/programs/kakoune/use-plugins.nix @@ -3,14 +3,14 @@ with lib; { - config = { - programs.kakoune = { - enable = true; - plugins = [ pkgs.kakounePlugins.kak-prelude ]; - }; + imports = [ ./stubs.nix ]; - nmt.script = '' - assertDirectoryNotEmpty home-path/share/kak/autoload/plugins - ''; + programs.kakoune = { + enable = true; + plugins = [ pkgs.kakounePlugins.prelude-kak ]; }; + + nmt.script = '' + assertDirectoryNotEmpty home-path/share/kak/autoload/plugins + ''; } diff --git a/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix b/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix index 142aaac8f..4beb4b9e5 100644 --- a/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix +++ b/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix @@ -3,23 +3,23 @@ with lib; { - config = { - programs.kakoune = { - enable = true; - config.showWhitespace = { - enable = true; - lineFeed = ''"''; - space = " "; - nonBreakingSpace = "' '"; # backwards compat - tab = "'"; - # tabStop = - }; - }; + imports = [ ./stubs.nix ]; - nmt.script = '' - assertFileExists home-files/.config/kak/kakrc - assertFileContains home-files/.config/kak/kakrc \ - "add-highlighter global/ show-whitespaces -tab \"'\" -spc ' ' -nbsp ' ' -lf '\"'" - ''; + programs.kakoune = { + enable = true; + config.showWhitespace = { + enable = true; + lineFeed = ''"''; + space = " "; + nonBreakingSpace = "' '"; # backwards compat + tab = "'"; + # tabStop = + }; }; + + nmt.script = '' + assertFileExists home-files/.config/kak/kakrc + assertFileContains home-files/.config/kak/kakrc \ + "add-highlighter global/ show-whitespaces -tab \"'\" -spc ' ' -nbsp ' ' -lf '\"'" + ''; } diff --git a/tests/modules/programs/kakoune/whitespace-highlighter.nix b/tests/modules/programs/kakoune/whitespace-highlighter.nix index 514c26a11..1c80fe5f2 100644 --- a/tests/modules/programs/kakoune/whitespace-highlighter.nix +++ b/tests/modules/programs/kakoune/whitespace-highlighter.nix @@ -3,23 +3,23 @@ with lib; { - config = { - programs.kakoune = { - enable = true; - config.showWhitespace = { - enable = true; - lineFeed = "1"; - space = "2"; - nonBreakingSpace = "3"; - tab = "4"; - tabStop = "5"; - }; - }; + imports = [ ./stubs.nix ]; - nmt.script = '' - assertFileExists home-files/.config/kak/kakrc - assertFileContains home-files/.config/kak/kakrc \ - "add-highlighter global/ show-whitespaces -tab '4' -tabpad '5' -spc '2' -nbsp '3' -lf '1'" - ''; + programs.kakoune = { + enable = true; + config.showWhitespace = { + enable = true; + lineFeed = "1"; + space = "2"; + nonBreakingSpace = "3"; + tab = "4"; + tabStop = "5"; + }; }; + + nmt.script = '' + assertFileExists home-files/.config/kak/kakrc + assertFileContains home-files/.config/kak/kakrc \ + "add-highlighter global/ show-whitespaces -tab '4' -tabpad '5' -spc '2' -nbsp '3' -lf '1'" + ''; }