diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index e8239681..48d9e05f 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -292,7 +292,7 @@ - Add lint (luacheck) and formatting (stylua) support for Lua. - Add lint (markdownlint-cli2) support for Markdown. -- Add catppuccin integration for Bufferline, Lspsaga. +- Add catppuccin integration for Lspsaga. [tebuevd](https://github.com/tebuevd): @@ -308,7 +308,3 @@ - Fix oil config referencing snacks - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim` - -[rrvsh](https://github.com/rrvsh): - -- Fix namespace of python-lsp-server by changing it to python3Packages diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index 476b56ef..ccb15f7c 100644 --- a/modules/plugins/languages/python.nix +++ b/modules/plugins/languages/python.nix @@ -47,7 +47,7 @@ }; python-lsp-server = { - package = pkgs.python3Packages.python-lsp-server; + package = pkgs.python-lsp-server; lspConfig = '' lspconfig.pylsp.setup{ capabilities = capabilities; diff --git a/modules/plugins/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix index 965f81f0..4989e991 100644 --- a/modules/plugins/tabline/nvim-bufferline/config.nix +++ b/modules/plugins/tabline/nvim-bufferline/config.nix @@ -9,7 +9,7 @@ inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.tabline.nvimBufferline; - self = import ./nvim-bufferline.nix {inherit config lib;}; + self = import ./nvim-bufferline.nix {inherit lib;}; inherit (self.options.vim.tabline.nvimBufferline) mappings; in { config = mkIf cfg.enable { diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix index 5a4f1ff0..dc32226e 100644 --- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix +++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: let +{lib, ...}: let inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.types) enum bool either nullOr str int listOf attrs; inherit (lib.generators) mkLuaInline; @@ -27,14 +23,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 - '' - require("catppuccin.groups.integrations.bufferline").get() - '' - else {}; + default = {}; description = '' Overrides the highlight groups of bufferline.