mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-17 07:43:21 +00:00
Compare commits
4 commits
fc6c11631b
...
bb3ca63d21
| Author | SHA1 | Date | |
|---|---|---|---|
|
bb3ca63d21 |
|||
|
38eed2d69d |
|||
|
5259d1887e |
|||
|
|
28af5c1ff9 |
4 changed files with 32 additions and 29 deletions
|
|
@ -306,12 +306,12 @@
|
|||
- Add lint (luacheck) and formatting (stylua) support for Lua.
|
||||
- Add lint (markdownlint-cli2) support for Markdown.
|
||||
- Add catppuccin integration for Bufferline, Lspsaga.
|
||||
- Add neo-tree integration for Bufferline.
|
||||
- Add `neo-tree`, `snacks.explorer` integrations to `bufferline`.
|
||||
- Add more applicable filetypes to illuminate denylist.
|
||||
- Disable mini.indentscope for applicable filetypes.
|
||||
- Fix fzf-lua having a hard dependency on fzf.
|
||||
- Enable inlay hints support - `config.vim.lsp.inlayHints`.
|
||||
- Add `neo-tree` extension to `lualine`.
|
||||
- Add `neo-tree`, `snacks.picker` extensions to `lualine`.
|
||||
|
||||
[tebuevd](https://github.com/tebuevd):
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{lib, ...}: let
|
||||
inherit (lib.options) mkOption mkEnableOption;
|
||||
inherit (lib.types) attrsOf str int nullOr;
|
||||
inherit (lib.types) listOf str int nullOr;
|
||||
inherit (lib.generators) mkLuaInline;
|
||||
inherit (lib.nvim.types) luaInline mkPluginSetupOption;
|
||||
inherit (lib.nvim.config) batchRenameOptions;
|
||||
|
|
@ -70,7 +70,7 @@ in {
|
|||
};
|
||||
|
||||
sources = mkOption {
|
||||
type = nullOr (attrsOf luaInline);
|
||||
type = nullOr (listOf luaInline);
|
||||
default = null;
|
||||
description = "Sources for null-ls to register";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,17 +14,28 @@
|
|||
bCfg = config.vim.ui.breadcrumbs;
|
||||
in {
|
||||
config = mkMerge [
|
||||
(mkIf config.vim.filetree.nvimTree.enable {
|
||||
vim.statusline.lualine.setupOpts = {
|
||||
extensions = ["nvim-tree"];
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf config.vim.filetree.neo-tree.enable {
|
||||
vim.statusline.lualine.setupOpts = {
|
||||
extensions = ["neo-tree"];
|
||||
};
|
||||
})
|
||||
{
|
||||
vim.statusline.lualine.setupOpts.extensions =
|
||||
(lib.optionals config.vim.filetree.nvimTree.enable ["nvim-tree"])
|
||||
++ (lib.optionals config.vim.filetree.neo-tree.enable ["neo-tree"])
|
||||
++ (lib.optionals config.vim.utility.snacks-nvim.enable [
|
||||
{
|
||||
# same extensions as nerdtree / neo-tree
|
||||
# https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/nerdtree.lua
|
||||
# https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/neo-tree.lua
|
||||
sections = {
|
||||
lualine_a = mkLuaInline ''
|
||||
{
|
||||
function()
|
||||
return vim.fn.fnamemodify(vim.fn.getcwd(), ":~")
|
||||
end,
|
||||
}
|
||||
'';
|
||||
};
|
||||
filetypes = ["snacks_picker_list" "snacks_picker_input"];
|
||||
}
|
||||
]);
|
||||
}
|
||||
|
||||
(mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") {
|
||||
vim.statusline.lualine.setupOpts = {
|
||||
|
|
|
|||
|
|
@ -272,20 +272,12 @@ in {
|
|||
|
||||
offsets = mkOption {
|
||||
type = listOf attrs;
|
||||
default = [
|
||||
{
|
||||
filetype = "NvimTree";
|
||||
text = "File Explorer";
|
||||
highlight = "Directory";
|
||||
separator = true;
|
||||
}
|
||||
{
|
||||
filetype = "neo-tree";
|
||||
text = "File Explorer";
|
||||
highlight = "Directory";
|
||||
separator = true;
|
||||
}
|
||||
];
|
||||
default = map (filetype: {
|
||||
inherit filetype;
|
||||
text = "File Explorer";
|
||||
highlight = "Directory";
|
||||
separator = true;
|
||||
}) ["NvimTree" "neo-tree" "snacks_layout_box"];
|
||||
description = "The windows to offset bufferline above, see `:help bufferline-offset`";
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue