From 2868e0ca36c24a5d99c9d081cd934231818cdb78 Mon Sep 17 00:00:00 2001 From: Nanderty Date: Sat, 20 May 2023 22:36:41 +0200 Subject: interface --- lua/config/keymaps.lua | 2 +- lua/config/options.lua | 5 ++-- lua/plugins/colorscheme.lua | 13 +++++--- lua/plugins/interface.lua | 73 ++++++++++++++++++++++++++++----------------- lua/plugins/telescope.lua | 2 +- lua/plugins/tex.lua | 2 ++ 6 files changed, 62 insertions(+), 35 deletions(-) (limited to 'lua') diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index f27094d..a345140 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -6,7 +6,7 @@ return { init = function() vim.keymap.set('v', 'J', ":m '>+1gv=gv") vim.keymap.set('v', 'K', ":m '<-2gv=gv") - vim.keymap.set('n', 'e', function() + vim.keymap.set('n', 'r', function() vim.lsp.buf.format({ timeout_ms = 10000 }) end) vim.keymap.set('n', 'w', 'w') diff --git a/lua/config/options.lua b/lua/config/options.lua index 591bb96..77ccaf1 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -18,9 +18,11 @@ return { vim.opt.undodir = { vim.fn.stdpath('data') .. '/undo' } vim.opt.undolevels = 1000 + vim.opt.relativenumber = true vim.opt.cmdheight = 0 vim.opt.fillchars = 'eob: ' - vim.opt.relativenumber = true + vim.opt.fillchars = 'fold: ' + vim.opt.fillchars = 'vert: ' vim.opt.showmode = false vim.opt.smartindent = true @@ -31,7 +33,6 @@ return { vim.opt.scrolloff = 20 vim.opt.numberwidth = 5 vim.opt.termguicolors = true - vim.opt.guifont = { 'Hack NFM:h12' } end, }, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 737e26e..4181b86 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -6,13 +6,18 @@ return { config = function() vim.opt.background = 'dark' require('monokai-pro').setup({ - override = function (c) + plugins = { + indent_blankline = { + context_highlight = "pro", + }, + }, + override = function(c) return { - TelescopePromptNormal = { bg = c.base.dimmed3}, + TelescopePromptNormal = { bg = c.base.dimmed3 }, TelescopePromptBorder = { bg = c.base.dimmed3, fg = c.base.dimmed3 }, - TelescopeResultsNormal = { bg = c.base.dimmed5}, + TelescopeResultsNormal = { bg = c.base.dimmed5 }, TelescopeResultsBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 }, - TelescopePreviewNormal = { bg = c.base.dimmed5}, + TelescopePreviewNormal = { bg = c.base.dimmed5 }, TelescopePreviewBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 }, TelescopePreviewDirectory = { diff --git a/lua/plugins/interface.lua b/lua/plugins/interface.lua index 795961a..75ce306 100644 --- a/lua/plugins/interface.lua +++ b/lua/plugins/interface.lua @@ -1,34 +1,53 @@ return { - { - 'akinsho/bufferline.nvim', - event = { - 'BufReadPost', - 'BufNewFile' - }, - dependencies = { - 'nvim-tree/nvim-web-devicons', - }, - opts = { - options = { - diagnostics = 'nvim_lsp', - always_show_bufferline = false, - buffer_close_icon = ' ', - }, - }, - }, { 'nvim-lualine/lualine.nvim', event = 'VeryLazy', - opts = { - sections = { - lualine_x = {}, - lualine_y = {}, - lualine_z = {} - }, - inactive_sections = { - lualine_x = {}, - }, - }, + config = function() + vim.api.nvim_set_hl(0, 'StatusLine', { bg = nil }) + vim.api.nvim_set_hl(0, 'StatusLineNC', { bg = nil }) + + local monokai_pro = require("lualine.themes.monokai-pro") + monokai_pro.normal.b.bg = nil + monokai_pro.normal.c.bg = nil + monokai_pro.normal.c.fg = nil + monokai_pro.inactive.z = { + bg = nil, + fg = require("monokai-pro.colorscheme").colors.base.yellow, + } + + local function separator() + return [[separator]] + end + + require('lualine').setup { + options = { + theme = monokai_pro, + }, + sections = { + lualine_b = { + 'branch', + { + 'diagnostics', + symbols = { + error = 'E', + warn = 'W', + info = 'I', + hint = 'H' + }, + }, + }, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { + 'buffers', + }, + }, + inactive_sections = { + lualine_x = {}, + }, + } + end, }, { 'lukas-reineke/indent-blankline.nvim', diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index c8e1cd1..2ff3777 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -48,7 +48,7 @@ return { { 'nvim-telescope/telescope-file-browser.nvim', keys = { - { 'v', 'Telescope file_browser path=%:p:h select_buffer=true', desc = 'file tree' }, + { 'v', function(...) require('telescope').extensions.file_browser.file_browser(...) end, desc = 'file tree' }, }, dependencies = { 'nvim-telescope/telescope.nvim', diff --git a/lua/plugins/tex.lua b/lua/plugins/tex.lua index 103d78f..54d2270 100644 --- a/lua/plugins/tex.lua +++ b/lua/plugins/tex.lua @@ -6,6 +6,8 @@ return { vim.g.vimtex_quickfix_open_on_warning = 0 vim.keymap.set('n', 'll', 'VimtexCompile') vim.g.vimtex_view_method = 'zathura_simple' + vim.g.vimtex_fold_enabled = 1 + vim.g.vimtex_fold_manual = 1 end, }, } -- cgit v1.2.3