mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 08:35:43 +02:00
plugins/{telescope,bufferline}: make use of helpers.extraOptionsOptions (#212)
This commit is contained in:
Gaétan Lepage
GitHub
parent
73bdf8a96f
commit
e439cb79df
2 changed files with 255 additions and 262 deletions
|
|
@ -35,224 +35,221 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
plugins.bufferline = {
|
plugins.bufferline =
|
||||||
enable = mkEnableOption "bufferline";
|
helpers.extraOptionsOptions
|
||||||
package = helpers.mkPackageOption "bufferline" pkgs.vimPlugins.bufferline-nvim;
|
// {
|
||||||
numbers = mkOption {
|
enable = mkEnableOption "bufferline";
|
||||||
type = types.nullOr types.lines;
|
package = helpers.mkPackageOption "bufferline" pkgs.vimPlugins.bufferline-nvim;
|
||||||
description = "A lua function customizing the styling of numbers.";
|
numbers = mkOption {
|
||||||
default = null;
|
type = types.nullOr types.lines;
|
||||||
};
|
description = "A lua function customizing the styling of numbers.";
|
||||||
closeCommand = mkOption {
|
default = null;
|
||||||
type = types.nullOr types.lines;
|
};
|
||||||
description = "Command or function run when closing a buffer.";
|
closeCommand = mkOption {
|
||||||
default = null;
|
type = types.nullOr types.lines;
|
||||||
};
|
description = "Command or function run when closing a buffer.";
|
||||||
rightMouseCommand = mkOption {
|
default = null;
|
||||||
type = types.nullOr types.lines;
|
};
|
||||||
description = "Command or function run when right clicking on a buffer.";
|
rightMouseCommand = mkOption {
|
||||||
default = null;
|
type = types.nullOr types.lines;
|
||||||
};
|
description = "Command or function run when right clicking on a buffer.";
|
||||||
leftMouseCommand = mkOption {
|
default = null;
|
||||||
type = types.nullOr types.lines;
|
};
|
||||||
description = "Command or function run when clicking on a buffer.";
|
leftMouseCommand = mkOption {
|
||||||
default = null;
|
type = types.nullOr types.lines;
|
||||||
};
|
description = "Command or function run when clicking on a buffer.";
|
||||||
middleMouseCommand = mkOption {
|
default = null;
|
||||||
type = types.nullOr types.lines;
|
};
|
||||||
description = "Command or function run when middle clicking on a buffer.";
|
middleMouseCommand = mkOption {
|
||||||
default = null;
|
type = types.nullOr types.lines;
|
||||||
};
|
description = "Command or function run when middle clicking on a buffer.";
|
||||||
# is deprecated, but might still work
|
default = null;
|
||||||
indicatorIcon = mkOption {
|
};
|
||||||
type = types.nullOr types.str;
|
# is deprecated, but might still work
|
||||||
description = "The Icon shown as a indicator for buffer. Changing it is NOT recommended,
|
indicatorIcon =
|
||||||
|
mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The Icon shown as a indicator for buffer. Changing it is NOT recommended,
|
||||||
this is intended to be an escape hatch for people who cannot bear it for whatever reason.";
|
this is intended to be an escape hatch for people who cannot bear it for whatever reason.";
|
||||||
default = null;
|
default = null;
|
||||||
};
|
|
||||||
bufferCloseIcon = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The close icon for each buffer.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
modifiedIcon = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The icon indicating a buffer was modified.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
closeIcon = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The close icon.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
leftTruncMarker = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
rightTruncMarker = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
nameFormatter = mkOption {
|
|
||||||
type = types.nullOr types.lines;
|
|
||||||
description = "A lua function that can be used to modify the buffer's lable. The argument 'buf' containing a name, path and bufnr is supplied.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
maxNameLength = mkOption {
|
|
||||||
type = types.nullOr types.int;
|
|
||||||
description = "Max length of a buffer name.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
maxPrefixLength = mkOption {
|
|
||||||
type = types.nullOr types.int;
|
|
||||||
description = "Max length of a buffer prefix (used when a buffer is de-duplicated)";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
tabSize = mkOption {
|
|
||||||
type = types.nullOr types.int;
|
|
||||||
description = "Size of the tabs";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
diagnostics = mkOption {
|
|
||||||
type = types.nullOr (types.enum [false "nvim_lsp" "coc"]);
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
diagnosticsUpdateInInsert = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
diagnosticsIndicator = mkOption {
|
|
||||||
type = types.nullOr helpers.rawType;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
customFilter = mkOption {
|
|
||||||
type = types.nullOr types.lines;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
showBufferIcons = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
showBufferCloseIcons = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
showCloseIcon = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
showTabIndicators = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
persistBufferSort = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
separatorStyle = mkOption {
|
|
||||||
type = types.nullOr (types.enum ["slant" "thick" "thin"]);
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
enforceRegularTabs = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
alwaysShowBufferline = mkOption {
|
|
||||||
type = types.nullOr types.bool;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
sortBy = mkOption {
|
|
||||||
type = types.nullOr (types.enum ["id" "extension" "relative_directory" "directory" "tabs"]);
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
indicator = mkOption {
|
|
||||||
default = {};
|
|
||||||
type = types.nullOr (types.submodule ({...}: {
|
|
||||||
options = {
|
|
||||||
icon = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
style = mkOption {
|
|
||||||
type = types.nullOr (types.enum ["icon" "underline" "none"]);
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}));
|
bufferCloseIcon = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The close icon for each buffer.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
modifiedIcon = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The icon indicating a buffer was modified.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
closeIcon = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The close icon.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
leftTruncMarker = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
rightTruncMarker = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
nameFormatter = mkOption {
|
||||||
|
type = types.nullOr types.lines;
|
||||||
|
description = "A lua function that can be used to modify the buffer's lable. The argument 'buf' containing a name, path and bufnr is supplied.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
maxNameLength = mkOption {
|
||||||
|
type = types.nullOr types.int;
|
||||||
|
description = "Max length of a buffer name.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
maxPrefixLength = mkOption {
|
||||||
|
type = types.nullOr types.int;
|
||||||
|
description = "Max length of a buffer prefix (used when a buffer is de-duplicated)";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
tabSize = mkOption {
|
||||||
|
type = types.nullOr types.int;
|
||||||
|
description = "Size of the tabs";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
diagnostics = mkOption {
|
||||||
|
type = types.nullOr (types.enum [false "nvim_lsp" "coc"]);
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
diagnosticsUpdateInInsert = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
diagnosticsIndicator = mkOption {
|
||||||
|
type = types.nullOr helpers.rawType;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
customFilter = mkOption {
|
||||||
|
type = types.nullOr types.lines;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
showBufferIcons = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
showBufferCloseIcons = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
showCloseIcon = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
showTabIndicators = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
persistBufferSort = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
separatorStyle = mkOption {
|
||||||
|
type = types.nullOr (types.enum ["slant" "thick" "thin"]);
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
enforceRegularTabs = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
alwaysShowBufferline = mkOption {
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
sortBy = mkOption {
|
||||||
|
type = types.nullOr (types.enum ["id" "extension" "relative_directory" "directory" "tabs"]);
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
indicator = mkOption {
|
||||||
|
default = {};
|
||||||
|
type = types.nullOr (types.submodule ({...}: {
|
||||||
|
options = {
|
||||||
|
icon = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
style = mkOption {
|
||||||
|
type = types.nullOr (types.enum ["icon" "underline" "none"]);
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
highlights = mkOption {
|
||||||
|
default = {};
|
||||||
|
type = types.nullOr (types.submodule ({...}: {
|
||||||
|
options = {
|
||||||
|
fill = highlight;
|
||||||
|
background = highlight;
|
||||||
|
|
||||||
|
tab = highlight;
|
||||||
|
tabSelected = highlight;
|
||||||
|
tabClose = highlight;
|
||||||
|
|
||||||
|
closeButton = highlight;
|
||||||
|
closeButtonVisible = highlight;
|
||||||
|
closeButtonSelected = highlight;
|
||||||
|
|
||||||
|
bufferVisible = highlight;
|
||||||
|
bufferSelected = highlight;
|
||||||
|
|
||||||
|
diagnostic = highlight;
|
||||||
|
diagnosticVisible = highlight;
|
||||||
|
diagnosticSelected = highlight;
|
||||||
|
|
||||||
|
info = highlight;
|
||||||
|
infoVisible = highlight;
|
||||||
|
infoSelected = highlight;
|
||||||
|
|
||||||
|
infoDiagnostic = highlight;
|
||||||
|
infoDiagnosticVisible = highlight;
|
||||||
|
infoDiagnosticSelected = highlight;
|
||||||
|
|
||||||
|
warning = highlight;
|
||||||
|
warningVisible = highlight;
|
||||||
|
warningSelected = highlight;
|
||||||
|
|
||||||
|
warningDiagnostic = highlight;
|
||||||
|
warningDiagnosticVisible = highlight;
|
||||||
|
warningDiagnosticSelected = highlight;
|
||||||
|
|
||||||
|
error = highlight;
|
||||||
|
errorVisible = highlight;
|
||||||
|
errorSelected = highlight;
|
||||||
|
|
||||||
|
errorDiagnostic = highlight;
|
||||||
|
errorDiagnosticVisible = highlight;
|
||||||
|
errorDiagnosticSelected = highlight;
|
||||||
|
|
||||||
|
modified = highlight;
|
||||||
|
modifiedVisible = highlight;
|
||||||
|
modifiedSelected = highlight;
|
||||||
|
|
||||||
|
duplicate = highlight;
|
||||||
|
duplicateVisible = highlight;
|
||||||
|
duplicateSelected = highlight;
|
||||||
|
|
||||||
|
separator = highlight;
|
||||||
|
separatorVisible = highlight;
|
||||||
|
separatorSelected = highlight;
|
||||||
|
|
||||||
|
indicatorSelected = highlight;
|
||||||
|
|
||||||
|
pick = highlight;
|
||||||
|
pickVisible = highlight;
|
||||||
|
pickSelected = highlight;
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
};
|
};
|
||||||
highlights = mkOption {
|
|
||||||
default = {};
|
|
||||||
type = types.nullOr (types.submodule ({...}: {
|
|
||||||
options = {
|
|
||||||
fill = highlight;
|
|
||||||
background = highlight;
|
|
||||||
|
|
||||||
tab = highlight;
|
|
||||||
tabSelected = highlight;
|
|
||||||
tabClose = highlight;
|
|
||||||
|
|
||||||
closeButton = highlight;
|
|
||||||
closeButtonVisible = highlight;
|
|
||||||
closeButtonSelected = highlight;
|
|
||||||
|
|
||||||
bufferVisible = highlight;
|
|
||||||
bufferSelected = highlight;
|
|
||||||
|
|
||||||
diagnostic = highlight;
|
|
||||||
diagnosticVisible = highlight;
|
|
||||||
diagnosticSelected = highlight;
|
|
||||||
|
|
||||||
info = highlight;
|
|
||||||
infoVisible = highlight;
|
|
||||||
infoSelected = highlight;
|
|
||||||
|
|
||||||
infoDiagnostic = highlight;
|
|
||||||
infoDiagnosticVisible = highlight;
|
|
||||||
infoDiagnosticSelected = highlight;
|
|
||||||
|
|
||||||
warning = highlight;
|
|
||||||
warningVisible = highlight;
|
|
||||||
warningSelected = highlight;
|
|
||||||
|
|
||||||
warningDiagnostic = highlight;
|
|
||||||
warningDiagnosticVisible = highlight;
|
|
||||||
warningDiagnosticSelected = highlight;
|
|
||||||
|
|
||||||
error = highlight;
|
|
||||||
errorVisible = highlight;
|
|
||||||
errorSelected = highlight;
|
|
||||||
|
|
||||||
errorDiagnostic = highlight;
|
|
||||||
errorDiagnosticVisible = highlight;
|
|
||||||
errorDiagnosticSelected = highlight;
|
|
||||||
|
|
||||||
modified = highlight;
|
|
||||||
modifiedVisible = highlight;
|
|
||||||
modifiedSelected = highlight;
|
|
||||||
|
|
||||||
duplicate = highlight;
|
|
||||||
duplicateVisible = highlight;
|
|
||||||
duplicateSelected = highlight;
|
|
||||||
|
|
||||||
separator = highlight;
|
|
||||||
separatorVisible = highlight;
|
|
||||||
separatorSelected = highlight;
|
|
||||||
|
|
||||||
indicatorSelected = highlight;
|
|
||||||
|
|
||||||
pick = highlight;
|
|
||||||
pickVisible = highlight;
|
|
||||||
pickSelected = highlight;
|
|
||||||
};
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
|
|
||||||
extraOptions = mkOption {
|
|
||||||
type = types.attrs;
|
|
||||||
default = {};
|
|
||||||
description = "Extra options, will override others if defined";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = let
|
config = let
|
||||||
|
|
|
||||||
|
|
@ -18,58 +18,54 @@ in {
|
||||||
|
|
||||||
# TODO:add support for aditional filetypes. This requires autocommands!
|
# TODO:add support for aditional filetypes. This requires autocommands!
|
||||||
|
|
||||||
options.plugins.telescope = {
|
options.plugins.telescope =
|
||||||
enable = mkEnableOption "telescope.nvim";
|
helpers.extraOptionsOptions
|
||||||
|
// {
|
||||||
|
enable = mkEnableOption "telescope.nvim";
|
||||||
|
|
||||||
package = helpers.mkPackageOption "telescope.nvim" pkgs.vimPlugins.telescope-nvim;
|
package = helpers.mkPackageOption "telescope.nvim" pkgs.vimPlugins.telescope-nvim;
|
||||||
|
|
||||||
keymaps = mkOption {
|
keymaps = mkOption {
|
||||||
type = types.attrsOf types.str;
|
type = types.attrsOf types.str;
|
||||||
description = "Keymaps for telescope.";
|
description = "Keymaps for telescope.";
|
||||||
default = {};
|
default = {};
|
||||||
example = {
|
example = {
|
||||||
"<leader>fg" = "live_grep";
|
"<leader>fg" = "live_grep";
|
||||||
"<C-p>" = "git_files";
|
"<C-p>" = "git_files";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
keymapsSilent = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "Whether telescope keymaps should be silent";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
highlightTheme = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The colorscheme to use for syntax highlighting";
|
||||||
|
default = config.colorscheme;
|
||||||
|
};
|
||||||
|
|
||||||
|
enabledExtensions = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
description = "A list of enabled extensions. Don't use this directly";
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
|
||||||
|
extensionConfig = mkOption {
|
||||||
|
type = types.attrsOf types.anything;
|
||||||
|
description = "Configuration for the extensions. Don't use this directly";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
|
||||||
|
defaults = mkOption {
|
||||||
|
type = types.nullOr types.attrs;
|
||||||
|
default = null;
|
||||||
|
description = "Telescope default configuration";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
keymapsSilent = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
description = "Whether telescope keymaps should be silent";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
highlightTheme = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The colorscheme to use for syntax highlighting";
|
|
||||||
default = config.colorscheme;
|
|
||||||
};
|
|
||||||
|
|
||||||
enabledExtensions = mkOption {
|
|
||||||
type = types.listOf types.str;
|
|
||||||
description = "A list of enabled extensions. Don't use this directly";
|
|
||||||
default = [];
|
|
||||||
};
|
|
||||||
|
|
||||||
extensionConfig = mkOption {
|
|
||||||
type = types.attrsOf types.anything;
|
|
||||||
description = "Configuration for the extensions. Don't use this directly";
|
|
||||||
default = {};
|
|
||||||
};
|
|
||||||
|
|
||||||
defaults = mkOption {
|
|
||||||
type = types.nullOr types.attrs;
|
|
||||||
default = null;
|
|
||||||
description = "Telescope default configuration";
|
|
||||||
};
|
|
||||||
|
|
||||||
extraOptions = mkOption {
|
|
||||||
type = types.attrs;
|
|
||||||
default = {};
|
|
||||||
description = "An attribute set, that lets you set extra options or override options set by nixvim";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
extraPackages = [pkgs.bat];
|
extraPackages = [pkgs.bat];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue