Mirrors/home-manager
2
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-10 07:04:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

kakoune: implement whitespace highlighter config

Browse source 
The options under `programs.kakoune.config.showWhitespace` existed
but were not implemented.

PR #1162
This commit is contained in:
Robin Stumm 2020-04-16 13:36:21 +02:00 committed by Robert Helgesson
parent f6afd95ef8
commit 86ccd8fecb
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
4 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/programs/kakoune.nix
View file

@ -513,6 +513,15 @@ let
"${optionalString (separator != null) " -separator ${separator}"}"
];
showWhitespaceOptions = with cfg.config.showWhitespace;
concatStrings [
(optionalString (tab != null) " -tab ${tab}")
(optionalString (tabStop != null) " -tabpad ${tabStop}")
(optionalString (space != null) " -spc ${space}")
(optionalString (nonBreakingSpace != null) " -nbsp ${nonBreakingSpace}")
(optionalString (lineFeed != null) " -lf ${lineFeed}")
];
uiOptions = with cfg.config.ui;
concatStringsSep " " [
"ncurses_set_title=${if setTitle then "true" else "false"}"
@ -572,6 +581,8 @@ let
++ optional (numberLines != null && numberLines.enable)
"add-highlighter global/ number-lines${numberLinesOptions}"
++ optional showMatching "add-highlighter global/ show-matching"
++ optional (showWhitespace != null && showWhitespace.enable)
"add-highlighter global/ show-whitespaces${showWhitespaceOptions}"
++ optional (scrollOff != null)
"set-option global scrolloff ${toString scrollOff.lines},${
toString scrollOff.columns

1
tests/default.nix
View file

@ -32,6 +32,7 @@ import nmt {
./modules/programs/fish
./modules/programs/git
./modules/programs/gpg
./modules/programs/kakoune
./modules/programs/lieer
./modules/programs/mbsync
./modules/programs/neomutt

1
tests/modules/programs/kakoune/default.nix Normal file
View file

@ -0,0 +1 @@
{ kakoune-whitespace-highlighter = ./whitespace-highlighter.nix; }

32
tests/modules/programs/kakoune/whitespace-highlighter.nix Normal file
View file

@ -0,0 +1,32 @@
{ config, lib, pkgs, ... }:
with lib;
{
config = {
programs.kakoune = {
enable = true;
config.showWhitespace = {
enable = true;
lineFeed = "1";
space = "2";
nonBreakingSpace = "3";
tab = "4";
tabStop = "5";
};
};
nmt.script = let
lineStart =
"^add-highlighter\\s\\+global\\/\\?\\s\\+show-whitespaces\\s\\+"
+ "\\(-\\w\\+\\s\\+.\\s\\+\\)*";
in ''
assertFileExists home-files/.config/kak/kakrc
assertFileRegex home-files/.config/kak/kakrc '${lineStart}-lf\s\+1\b'
assertFileRegex home-files/.config/kak/kakrc '${lineStart}-spc\s\+2\b'
assertFileRegex home-files/.config/kak/kakrc '${lineStart}-nbsp\s\+3\b'
assertFileRegex home-files/.config/kak/kakrc '${lineStart}-tab\s\+4\b'
assertFileRegex home-files/.config/kak/kakrc '${lineStart}-tabpad\s\+5\b'
'';
};
}