From 25319c7f838598679029193a3b2f9f6d28655f1a Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sat, 15 May 2021 20:54:41 +0200 Subject: updates to nvim --- .config/nvim/lua/_compe/init.lua | 74 ----------------------------------- .config/nvim/lua/_galaxyline/init.lua | 10 ++--- .config/nvim/lua/_nvimtree/init.lua | 2 +- .config/nvim/lua/_true-zen/init.lua | 2 +- .config/nvim/lua/mappings.lua | 1 - .config/nvim/lua/settings.lua | 2 + 6 files changed, 9 insertions(+), 82 deletions(-) (limited to '.config/nvim/lua') diff --git a/.config/nvim/lua/_compe/init.lua b/.config/nvim/lua/_compe/init.lua index d386505..95c972d 100644 --- a/.config/nvim/lua/_compe/init.lua +++ b/.config/nvim/lua/_compe/init.lua @@ -33,80 +33,6 @@ require'compe'.setup { } } ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  --- ﬘ ---  ---  ---  --- m ---  ---  ---  ---  - --- local t = function(str) --- return vim.api.nvim_replace_termcodes(str, true, true, true) --- end - --- local check_back_space = function() --- local col = vim.fn.col('.') - 1 --- if col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then --- return true --- else --- return false --- end --- end - --- -- Use (s-)tab to: --- --- move to prev/next item in completion menuone --- --- jump to prev/next snippet's placeholder --- _G.tab_complete = function() --- if vim.fn.pumvisible() == 1 then --- return t "" --- elseif vim.fn.call("vsnip#available", {1}) == 1 then --- return t "(vsnip-expand-or-jump)" --- elseif check_back_space() then --- return t "" --- else --- return vim.fn['compe#complete']() --- end --- end --- _G.s_tab_complete = function() --- if vim.fn.pumvisible() == 1 then --- return t "" --- elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then --- return t "(vsnip-jump-prev)" --- else --- return t "" --- end --- end - --- vim.api.nvim_set_keymap("i", "", "v:lua.tab_complete()", {expr = true}) --- vim.api.nvim_set_keymap("s", "", "v:lua.tab_complete()", {expr = true}) --- vim.api.nvim_set_keymap("i", "", "v:lua.s_tab_complete()", {expr = true}) --- vim.api.nvim_set_keymap("s", "", "v:lua.s_tab_complete()", {expr = true}) - - - - - - - local t = function(str) return vim.api.nvim_replace_termcodes(str, true, true, true) end diff --git a/.config/nvim/lua/_galaxyline/init.lua b/.config/nvim/lua/_galaxyline/init.lua index e34c606..8673cde 100644 --- a/.config/nvim/lua/_galaxyline/init.lua +++ b/.config/nvim/lua/_galaxyline/init.lua @@ -105,15 +105,15 @@ gls.left[6] = { } gls.right[1] = { - DiagnosticError = {provider = 'DiagnosticError', icon = '  ', highlight = {colors.error_red, colors.bg}} + DiagnosticError = {provider = 'DiagnosticError', icon = '  ', highlight = {colors.error_red, colors.bg}} } -gls.right[2] = {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = '  ', highlight = {colors.orange, colors.bg}}} +gls.right[2] = {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = '  ', highlight = {colors.orange, colors.bg}}} gls.right[3] = { - DiagnosticHint = {provider = 'DiagnosticHint', icon = '  ', highlight = {colors.vivid_blue, colors.bg}} + DiagnosticHint = {provider = 'DiagnosticHint', icon = '  ', highlight = {colors.vivid_blue, colors.bg}} } -gls.right[4] = {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = '  ', highlight = {colors.info_yellow, colors.bg}}} +gls.right[4] = {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = '  ', highlight = {colors.info_yellow, colors.bg}}} gls.right[5] = { ShowLspClient = { @@ -123,7 +123,7 @@ gls.right[5] = { if tbl[vim.bo.filetype] then return false end return true end, - icon = ' ', + icon = ' ', highlight = {colors.grey, colors.bg} } } diff --git a/.config/nvim/lua/_nvimtree/init.lua b/.config/nvim/lua/_nvimtree/init.lua index 9f9cfd5..7dfa02f 100644 --- a/.config/nvim/lua/_nvimtree/init.lua +++ b/.config/nvim/lua/_nvimtree/init.lua @@ -1,4 +1,4 @@ -vim.g.nvim_tree_disable_netrw = 0 -- "1 by default, disables netrw +-- vim.g.nvim_tree_disable_netrw = 0 -- "1 by default, disables netrw -- vim.g.nvim_tree_hijack_netrw = 0 --"1 by default, prevents netrw from automatically opening when opening directories (but lets you keep its other utilities) vim.g.nvim_tree_hide_dotfiles = 1 -- 0 by default, this option hides files and folders starting with a dot `.` vim.g.nvim_tree_indent_markers = 1 -- "0 by default, this option shows indent markers when folders are open diff --git a/.config/nvim/lua/_true-zen/init.lua b/.config/nvim/lua/_true-zen/init.lua index 1abb9a0..0705fbb 100644 --- a/.config/nvim/lua/_true-zen/init.lua +++ b/.config/nvim/lua/_true-zen/init.lua @@ -28,7 +28,7 @@ true_zen.setup({ hidden_signcolumn = "no", shown_number = true, - shown_relativenumber = false, + shown_relativenumber = true, shown_signcolumn = "no" }, ataraxis = { diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 2e3eb7c..1402d14 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -49,4 +49,3 @@ vim.api.nvim_set_keymap('x', 'J', ':move \'>+1gv-gv', {noremap = true, silen -- Better nav for omnicomplete vim.cmd('inoremap (\"\\\")') vim.cmd('inoremap (\"\\\")') - diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 2cd1a40..27b1682 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -1,6 +1,8 @@ vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object" vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|. vim.cmd('set inccommand=split') -- Make substitution work in realtime +vim.cmd('setlocal indentkeys-=:') +vim.cmd('setlocal indentkeys-=:') vim.o.hidden = O.hidden_files -- Required to keep multiple buffers open multiple buffers vim.o.title = true TERMINAL = vim.fn.expand('$TERMINAL') -- cgit v1.2.3-70-g09d2