1
0
Fork 0

nvim changes

This commit is contained in:
Luca Bilke 2022-11-02 08:55:32 +01:00
commit a5cb394d0a
4 changed files with 58 additions and 17 deletions
.config
nvim/lua
shell

View file

@ -86,7 +86,8 @@ return {
Dashboard = "", Dashboard = "",
DividerLeft = "", DividerLeft = "",
DividerRight = "", DividerRight = "",
DoubleChevronRight = "»", DoubleChevronRight = "",
DoubleChevronLeft = "",
Ellipsis = "", Ellipsis = "",
EmptyFolder = "", EmptyFolder = "",
EmptyFolderOpen = "", EmptyFolderOpen = "",

View file

@ -1,23 +1,60 @@
local colors = require('tokyonight.colors').setup({ transform = true })
local status_ok, bufferline = pcall(require, "bufferline") local status_ok, bufferline = pcall(require, "bufferline")
if not status_ok then if not status_ok then
return return
end end
local icons = require 'config.iconlist'
local function is_ft(b, ft) local function is_ft(b, ft)
return vim.bo[b].filetype == ft return vim.bo[b].filetype == ft
end end
local icons = require 'config.iconlist' local function diagnostics_indicator(_, _, diagnostics, _)
local result = {}
local symbols = {
error = icons.diagnostics.Error,
warning = icons.diagnostics.Warning,
info = icons.diagnostics.Information,
}
for name, count in pairs(diagnostics) do
if symbols[name] and count > 0 then
table.insert(result, symbols[name] .. " " .. count)
end
end
result = table.concat(result, " ")
return #result > 0 and result or ""
end
local function custom_filter(buf, buf_nums)
local logs = vim.tbl_filter(function(b)
return is_ft(b, "log")
end, buf_nums)
if vim.tbl_isempty(logs) then
return true
end
local tab_num = vim.fn.tabpagenr()
local last_tab = vim.fn.tabpagenr "$"
local is_log = is_ft(buf, "log")
if last_tab == 1 then
return true
end
-- only show log buffers in secondary tabs
return (tab_num == last_tab and is_log) or (tab_num ~= last_tab and not is_log)
end
local config = { local config = {
-- highlights = { highlights = {
-- background = { background = {
-- italic = true, italic = true,
-- }, bold = false,
-- buffer_selected = { },
-- bold = true, buffer_selected = {
-- }, italic = false,
-- }, bold = true,
},
},
options = { options = {
mode = "buffers", -- set to "tabs" to only show tabpages instead mode = "buffers", -- set to "tabs" to only show tabpages instead
numbers = "none", -- can be "none" | "ordinal" | "buffer_id" | "both" | function numbers = "none", -- can be "none" | "ordinal" | "buffer_id" | "both" | function
@ -26,7 +63,7 @@ local config = {
left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions" left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions"
middle_mouse_command = nil, -- can be a string | function, see "Mouse actions" middle_mouse_command = nil, -- can be a string | function, see "Mouse actions"
indicator = { indicator = {
icon = icons.ui.BoldLineLeft, -- this should be omitted if indicator style is not 'icon' icon = icons.ui.DoubleChevronRight, -- this should be omitted if indicator style is not 'icon'
style = "icon", -- can also be 'underline'|'none', style = "icon", -- can also be 'underline'|'none',
}, },
buffer_close_icon = icons.ui.Close, buffer_close_icon = icons.ui.Close,
@ -50,6 +87,9 @@ local config = {
tab_size = 18, tab_size = 18,
diagnostics = "nvim_lsp", diagnostics = "nvim_lsp",
diagnostics_update_in_insert = false, diagnostics_update_in_insert = false,
diagnostics_indicator = diagnostics_indicator,
-- NOTE: this will be called a lot so don't do any heavy processing here
custom_filter = custom_filter,
offsets = { offsets = {
{ {
filetype = "undotree", filetype = "undotree",
@ -89,7 +129,7 @@ local config = {
persist_buffer_sort = true, -- whether or not custom sorted buffers should persist persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
-- can also be a table containing 2 custom separators -- can also be a table containing 2 custom separators
-- [focused and unfocused]. eg: { '|', '|' } -- [focused and unfocused]. eg: { '|', '|' }
separator_style = "thin", separator_style = { '', '' },
enforce_regular_tabs = false, enforce_regular_tabs = false,
always_show_bufferline = false, always_show_bufferline = false,
hover = { hover = {

View file

@ -24,10 +24,10 @@ local config = {
options = { options = {
component_separators = '', component_separators = '',
section_separators = '', section_separators = '',
theme = { -- theme = {
normal = { c = { fg = colors.fg, bg = colors.bg } }, -- normal = { c = { fg = colors.fg, bg = colors.bg } },
inactive = { c = { fg = colors.fg, bg = colors.bg } }, -- inactive = { c = { fg = colors.fg, bg = colors.bg } },
}, -- },
disabled_filetypes = { disabled_filetypes = {
statusline = { 'alpha' } statusline = { 'alpha' }
}, },

View file

@ -63,7 +63,7 @@ export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname
export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm
export ANSIBLE_NOCOWS=1 # Stop those fucking cows in Ansible export ANSIBLE_NOCOWS=1 # Stop those fucking cows in Ansible
export VIRTUAL_ENV_DISABLE_PROMPT=1 export VIRTUAL_ENV_DISABLE_PROMPT=1
export VAULT_ADDR='https://vault.tralios.de:8200' export VAULT_ADDR='https://vault.tralios.de'
# This is the list for lf icons: # This is the list for lf icons: