raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-12-19 09:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: missing closing bracket when navbuddy is disabled

Browse source
This commit is contained in:
NotAShelf 2023-08-10 20:24:30 +03:00
parent a9430961e8
commit de48713394
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/lua.nix
View file

@ -13,7 +13,6 @@
else "'${value}'"; else "'${value}'";
# convert an expression to lua # convert an expression to lua
expToLua = exp: expToLua = exp:
if builtins.isList exp if builtins.isList exp
then listToLuaTable exp # if list, convert to lua table then listToLuaTable exp # if list, convert to lua table

34
modules/ui/breadcrumbs/config.nix
View file

@ -3,42 +3,40 @@
lib, lib,
... ...
}: }:
with lib;
with builtins; let with builtins; let
inherit (lib) optionalString boolToString mkIf optionals;
inherit (lib.nvim.lua) nullString;
cfg = config.vim.ui.breadcrumbs; cfg = config.vim.ui.breadcrumbs;
nb = cfg.navbuddy; nb = cfg.navbuddy;
nilOrStr = v:
if v == null
then "nil"
else toString v;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.startPlugins = vim.startPlugins =
[ [
"nvim-lspconfig" "nvim-lspconfig"
] ]
++ lib.optionals (cfg.source == "nvim-navic") [ ++ optionals (cfg.source == "nvim-navic") [
"nvim-navic" "nvim-navic"
] ]
++ lib.optionals (config.vim.lsp.lspsaga.enable && cfg.source == "lspsaga") [ ++ optionals (config.vim.lsp.lspsaga.enable && cfg.source == "lspsaga") [
"lspsaga" "lspsaga"
] ]
++ lib.optionals cfg.navbuddy.enable [ ++ optionals cfg.navbuddy.enable [
"nvim-navbuddy" "nvim-navbuddy"
"nui-nvim" "nui-nvim"
"nvim-navic"
]; ];
vim.luaConfigRC.breadcrumbs = nvim.dag.entryAfter ["lspconfig"] '' vim.luaConfigRC.breadcrumbs = lib.nvim.dag.entryAfter ["lspconfig"] ''
${lib.optionalString (cfg.source == "nvim-navic") '' ${optionalString (cfg.source == "nvim-navic") ''
local navic = require("nvim-navic") local navic = require("nvim-navic")
require("nvim-navic").setup { require("nvim-navic").setup {
highlight = true highlight = true
} }
''} ''}
${lib.optionalString cfg.navbuddy.enable '' ${optionalString cfg.navbuddy.enable ''
local navbuddy = require("nvim-navbuddy") local navbuddy = require("nvim-navbuddy")
local actions = require("nvim-navbuddy.actions") local actions = require("nvim-navbuddy.actions")
navbuddy.setup { navbuddy.setup {
@ -46,20 +44,20 @@ in {
border = "${nb.window.border}", -- "rounded", "double", "solid", "none" border = "${nb.window.border}", -- "rounded", "double", "solid", "none"
size = "60%", size = "60%",
position = "50%", position = "50%",
scrolloff = ${(nilOrStr nb.window.scrolloff)}, scrolloff = ${(nullString nb.window.scrolloff)},
sections = { sections = {
left = { left = {
size = "20%", size = "20%",
border = ${(nilOrStr nb.window.sections.left.border)}, border = ${(nullString nb.window.sections.left.border)},
}, },
mid = { mid = {
size = "40%", size = "40%",
border = ${(nilOrStr nb.window.sections.mid.border)}, border = ${(nullString nb.window.sections.mid.border)},
}, },
right = { right = {
border = ${(nilOrStr nb.window.sections.right.border)}, border = ${(nullString nb.window.sections.right.border)},
preview = "leaf", preview = "leaf",
} }
}, },
@ -82,7 +80,7 @@ in {
follow_node = ${boolToString nb.sourceBuffer.followNode}, follow_node = ${boolToString nb.sourceBuffer.followNode},
highlight = ${boolToString nb.sourceBuffer.highlight}, highlight = ${boolToString nb.sourceBuffer.highlight},
reorient = "${nb.sourceBuffer.reorient}", reorient = "${nb.sourceBuffer.reorient}",
scrolloff = ${nilOrStr nb.sourceBuffer.scrolloff} scrolloff = ${nullString nb.sourceBuffer.scrolloff}
}, },
icons = { icons = {
@ -115,7 +113,7 @@ in {
}, },
-- make those configurable -- make those configurable
use_default_mappings = ${toString (cfg.navbuddy.useDefaultMappings)}, use_default_mappings = ${boolToString cfg.navbuddy.useDefaultMappings},
mappings = { mappings = {
["${cfg.navbuddy.mappings.close}"] = actions.close(), ["${cfg.navbuddy.mappings.close}"] = actions.close(),
["${cfg.navbuddy.mappings.nextSibling}"] = actions.next_sibling(), ["${cfg.navbuddy.mappings.nextSibling}"] = actions.next_sibling(),