fix: bad rebase

This commit is contained in:
Ching Pei Yang 2024-04-19 21:28:07 +02:00
commit 3766db3503
9 changed files with 49 additions and 35 deletions

View file

@ -4,7 +4,7 @@
lib,
...
}: let
inherit (lib) mkMerge mkIf;
inherit (lib.modules) mkMerge mkIf;
inherit (lib.nvim.binds) mkBinding;
inherit (lib.nvim.lua) toLuaObject;

View file

@ -3,8 +3,11 @@
lib,
...
}: let
inherit (lib) mkEnableOption mkOption types mkRenamedOptionModule;
inherit (lib.modules) mkRenamedOptionModule;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) str listOf;
inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.nvim.types) mkPluginSetupOption;
in {
imports = let
renamedSetupOption = oldPath: newPath:
@ -19,10 +22,10 @@ in {
options.vim.notes.todo-comments = {
enable = mkEnableOption "todo-comments: highlight and search for todo comments like TODO, HACK, BUG in your code base";
setupOpts = lib.nvim.types.mkPluginSetupOption "todo-comments.nvim" {
setupOpts = mkPluginSetupOption "todo-comments.nvim" {
highlight = {
pattern = mkOption {
type = types.str;
type = str;
default = ''.*<(KEYWORDS)(\([^\)]*\))?:'';
description = "vim regex pattern used for highlighting comments";
};
@ -30,19 +33,19 @@ in {
search = {
pattern = mkOption {
type = types.str;
type = str;
default = ''\b(KEYWORDS)(\([^\)]*\))?:'';
description = "ripgrep regex pattern used for searching comments";
};
command = mkOption {
type = types.str;
type = str;
default = "${pkgs.ripgrep}/bin/rg";
description = "search command";
};
args = mkOption {
type = types.listOf types.str;
type = listOf str;
default = ["--color=never" "--no-heading" "--with-filename" "--line-number" "--column"];
description = "arguments to pass to the search command";
};