From 1d538b249f2e38de17fdb30ada15bb39e8596ebb Mon Sep 17 00:00:00 2001 From: Leon Kowarschick Date: Fri, 6 Oct 2023 13:37:22 +0200 Subject: [PATCH] fix bufferline --- .../nvim/fnl/dots/plugins/bufferline.fnl | 46 ++++++++++--------- nvim/.config/nvim/lazy-lock.json | 5 +- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl b/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl index 9481fc0..330b4ee 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl @@ -4,10 +4,12 @@ (al colors dots.colors) (al bufferline bufferline) +(print (vim.inspect colors)) + (fn setup [] ; :h bufferline-lua-highlights - (let [selected {:guibg colors.neutral_aqua :guifg colors.bg_main :gui "NONE"} - visible {:guibg colors.dark1 :guifg colors.neutral_aqua}] + (let [selected {:bg colors.neutral_aqua :fg colors.bg_main :gui "NONE"} + visible {:bg colors.dark1 :fg colors.neutral_aqua}] (bufferline.setup {:options {:diagnostics "nvim_lsp" @@ -21,39 +23,41 @@ ; https://github.com/akinsho/nvim-bufferline.lua/blob/4ebab39af2376b850724dd29c29579c8e024abe6/lua/bufferline/config.lua#L74 :highlights - {:fill {:guibg colors.bg_main :guifg colors.light0} + {:fill {:bg colors.bg_main :fg colors.light0} :background visible :buffer_visible visible - :buffer_selected selected + :buffer_selected (a.assoc selected :bold false :italic false) :modified visible :modified_selected selected :modified_visible visible :info visible :info_selected selected :info_visible visible :warning visible :warning_selected selected :warning_visible visible :error visible :error_selected selected :error_visible visible :duplicate visible :duplicate_selected selected :duplicate_visible visible - :diagnostic {:guibg colors.dark1 :guifg colors.neutral_red} - :diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_red} - :diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_redu} + :diagnostic {:bg colors.dark1 :fg colors.neutral_red} + :diagnostic_visible {:bg colors.dark1 :fg colors.neutral_red} + :diagnostic_selected {:bg colors.neutral_aqua :fg colors.faded_redu} - :info_diagnostic {:guibg colors.dark1 :guifg colors.neutral_blue} - :info_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_blue} - :info_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_blue} + :info_diagnostic {:bg colors.dark1 :fg colors.neutral_blue} + :info_diagnostic_visible {:bg colors.dark1 :fg colors.neutral_blue} + :info_diagnostic_selected {:bg colors.neutral_aqua :fg colors.faded_blue} - :warning_diagnostic {:guibg colors.dark1 :guifg colors.neutral_yellow} - :warning_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_yellow} - :warning_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_yellow} + :warning_diagnostic {:bg colors.dark1 :fg colors.neutral_yellow} + :warning_diagnostic_visible {:bg colors.dark1 :fg colors.neutral_yellow} + :warning_diagnostic_selected {:bg colors.neutral_aqua :fg colors.faded_yellow} - :error_diagnostic {:guibg colors.dark1 :guifg colors.neutral_red} - :error_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_red} - :error_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.red} + :error_diagnostic {:bg colors.dark1 :fg colors.neutral_red} + :error_diagnostic_visible {:bg colors.dark1 :fg colors.neutral_red} + :error_diagnostic_selected {:bg colors.neutral_aqua :fg colors.red} :separator visible - :indicator_selected {:guibg colors.neutral_aqua :guifg colors.neutral_aqua} + :indicator_selected {:bg colors.neutral_aqua :fg colors.neutral_aqua} + :tab_separator {:bg colors.red} + :tab_separator_selected {:bg colors.neutral_aqua :fg colors.neutral_aqua} ; stuff I've never seen before :thonk: - :pick_selected {:guibg colors.bright_red :guifg colors.bright_red} - :tab_selected {:guibg colors.bright_green :guifg colors.bright_green} - :tab {:guibg colors.bright_yellow :guifg colors.bright_yellow}}}))) + :pick_selected {:bg colors.bright_red :fg colors.bright_red} + :tab_selected {:bg colors.bright_green :fg colors.bright_green} + :tab {:bg colors.bright_yellow :fg colors.bright_yellow}}}))) [(utils.plugin :akinsho/nvim-bufferline.lua - {:config setup :tag "v1.1.1"})] + {:config setup :tag "v4.4.0"})] diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 753caec..4f8989f 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -20,6 +20,7 @@ "dressing.nvim": { "branch": "master", "commit": "8f4d62b7817455896a3c73cab642002072c114bc" }, "editorconfig-vim": { "branch": "master", "commit": "0d54ea863089fb13be423b4aed6cca35f3a5d778" }, "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, + "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" }, "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gh.nvim": { "branch": "main", "commit": "2b5551656c1b896bf4ae06546eaaab00311f9a18" }, @@ -39,9 +40,7 @@ "neogit": { "branch": "master", "commit": "ed99c59d7fda3ba5e2ce9a3adc0a8eb5ebfa6c8f" }, "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" }, "nfnl": { "branch": "main", "commit": "979dbfc48bcb601a9107764a99f9459cb5bd4051" }, - "noice.nvim": { "branch": "main", "commit": "7cf858c30841c9c41601ce58e5bc2023228037ef" }, - "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, - "nvim-bufferline.lua": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" }, + "nvim-bufferline.lua": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-code-action-menu": { "branch": "main", "commit": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },