Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/manual/release-notes/rl-26.12.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
- Dropping all old deprecations from 26.07 backwards. This is done to keep the
codebase maintainable.

- `theme`: replace the single-theme configuration with `vim.theme.themes` and
`vim.theme.default`. The legacy `name`, `style`, and `transparent` options
remain available temporarily with a migration warning.

Catppuccin integrations are now opt-in through
`vim.theme.catppuccin.integrations.<plugin>.enable`.

[snoweuph](https://github.com/snoweuph)

- splitting `languages/json5` from `languages/json`, because most `json` and
Expand Down
26 changes: 7 additions & 19 deletions modules/plugins/lsp/lspsaga/lspsaga.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@
inherit (lib.modules) mkRemovedOptionModule;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.nvim.types) borderType mkPluginSetupOption;
inherit (lib.nvim.lua) mkLuaInline;

uiKindSetupOpts =
if config.vim.theme.enable && config.vim.theme.name == "catppuccin"
then {
ui.kind = mkLuaInline ''
require("catppuccin.groups.integrations.lsp_saga").custom_kind()
'';
}
else {};
in {
imports = [
(mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] ''
Expand All @@ -31,14 +21,12 @@ in {
options.vim.lsp.lspsaga = {
enable = mkEnableOption "LSP Saga";

setupOpts =
mkPluginSetupOption "lspsaga" {
border_style = mkOption {
type = borderType;
default = config.vim.ui.borders.globalStyle;
description = "Border type, see {command}`:help nvim_open_win`";
};
}
// uiKindSetupOpts;
setupOpts = mkPluginSetupOption "lspsaga" {
border_style = mkOption {
type = borderType;
default = config.vim.ui.borders.globalStyle;
description = "Border type, see {command}`:help nvim_open_win`";
};
};
};
}
17 changes: 5 additions & 12 deletions modules/plugins/statusline/lualine/lualine.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
lib,
...
}: let
inherit (builtins) elem;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) int bool str listOf enum;
inherit (lib.lists) optional;
inherit (lib.nvim.types) mkPluginSetupOption;

supported_themes = import ./supported_themes.nix;
Expand Down Expand Up @@ -124,16 +122,11 @@ in {
'';
};

theme = let
themeSupported = elem config.vim.theme.name supported_themes;
themesConcatted = builtin_themes ++ optional themeSupported config.vim.theme.name;
in
mkOption {
type = enum themesConcatted;
default = "auto";
defaultText = ''`config.vim.theme.name` if theme supports lualine else "auto"'';
description = "Theme for lualine";
};
theme = mkOption {
type = enum (builtin_themes ++ supported_themes);
default = "auto";
description = "Theme for lualine";
};

sectionSeparator = {
left = mkOption {
Expand Down
22 changes: 2 additions & 20 deletions modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
lib,
...
}: let
inherit (lib.options) mkOption mkEnableOption literalExpression literalMD;
inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.types) enum bool either nullOr str int listOf attrs;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.types) mkPluginSetupOption luaInline;
Expand All @@ -27,25 +27,7 @@ in {
setupOpts = mkPluginSetupOption "bufferline-nvim" {
highlights = mkOption {
type = either attrs luaInline;
default =
if config.vim.theme.enable && config.vim.theme.name == "catppuccin"
then
mkLuaInline ''
(function()
local integration = require("catppuccin.special.bufferline")
return (integration.get_theme or integration.get)()
end)()
''
else {};
defaultText = literalMD ''
```lua
(function()
local integration = require("catppuccin.special.bufferline")
return (integration.get_theme or integration.get)()
end)()
```
if the active theme is Catppuccin, `{}` otherwise.
'';
default = {};
description = ''
Overrides the highlight groups of bufferline.

Expand Down
Loading
Loading