Merge branch 'main' into remove-trailing-whitespaces

This commit is contained in:
Pedro Alves 2023-01-21 17:11:56 +00:00 committed by GitHub
commit e686e31bd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 695 additions and 234 deletions

View file

@ -7,6 +7,12 @@ in
options.plugins.barbar = {
enable = mkEnableOption "Enable barbar.nvim";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.barbar-nvim;
description = "Plugin to use for barbar";
};
animations = mkOption {
type = types.nullOr types.bool;
default = null;
@ -50,7 +56,7 @@ in
config = mkIf cfg.enable {
extraPlugins = with pkgs.vimPlugins; [
barbar-nvim nvim-web-devicons
cfg.package nvim-web-devicons
];
# maps = genMaps cfg.keys;

View file

@ -26,6 +26,11 @@ in
options = {
plugins.bufferline = {
enable = mkEnableOption "Enable bufferline";
package = mkOption {
type = types.package;
description = "Plugin to use for bufferline";
default = pkgs.vimPlugins.bufferline-nvim;
};
numbers = mkOption {
type = types.nullOr types.lines;
description = "A lua function customizing the styling of numbers.";
@ -109,7 +114,7 @@ in
default = null;
};
diagnosticsIndicator = mkOption {
type = types.nullOr types.lines;
type = types.nullOr helpers.rawType;
default = null;
};
customFilter = mkOption {
@ -218,6 +223,12 @@ in
};
}));
};
extraOptions = mkOption {
type = types.attrs;
default = { };
description = "Extra options, will override others if defined";
};
};
};
@ -253,7 +264,7 @@ in
enforce_regular_tabs = cfg.enforceRegularTabs;
always_show_bufferline = cfg.alwaysShowBufferline;
sort_by = cfg.sortBy;
};
} // cfg.extraOptions;
highlights = if builtins.isNull cfg.highlights then null else with cfg.highlights; {
fill = fill;
background = background;
@ -319,7 +330,7 @@ in
in
mkIf cfg.enable {
extraPlugins = with pkgs.vimPlugins; [
bufferline-nvim
cfg.package
nvim-web-devicons
];
options.termguicolors = true;