From 59d913dd56b9c01b960b276c3447fe0bd54d6d5c Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 5 Sep 2023 15:29:19 +0200 Subject: up --- .config/nvim/init.lua | 3 ++- .config/nvim/lua/bindings.lua | 28 ++-------------------------- .config/nvim/lua/plugs-config/lualine.lua | 4 ++-- .config/nvim/lua/plugs-config/whichkey.lua | 27 +++++++++++++++++++++++++++ .config/nvim/lua/settings.lua | 2 +- 5 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 .config/nvim/lua/plugs-config/whichkey.lua (limited to '.config/nvim') diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 05b82b6..722ce9c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -20,10 +20,11 @@ require('settings') require('bindings') require('sidebars') require('langs') -require('plugs-config/treesitter') require('plugs-config/asyncomplete') require('plugs-config/floaterm') require('plugs-config/lualine') +require('plugs-config/treesitter') +require('plugs-config/whichkey') -- vim.cmd('source ' .. confdir .. '/nvim/plug-config/airline.vim') vim.cmd('source ' .. confdir .. '/nvim/plug-config/nerd-commenter.vim') vim.cmd('source ' .. confdir .. '/nvim/plug-config/org.vim') diff --git a/.config/nvim/lua/bindings.lua b/.config/nvim/lua/bindings.lua index d844ab0..49f2cf9 100644 --- a/.config/nvim/lua/bindings.lua +++ b/.config/nvim/lua/bindings.lua @@ -1,29 +1,5 @@ -local wk = require("which-key") -wk.register({ - b = { ':Buffers', 'buffers', noremap = true, silent = true }, - c = { name = '+nerd-commenter' }, - d = { ':bd', 'close buffer', noremap = true, silent = false }, - e = { ':Files', 'files', noremap = true, silent = true }, - G = { ':FloatermNew lazygit', 'lazygit', noremap = true, silent = true }, - h = { ':Startify', 'startify', noremap = true, silent = true }, - k = { ':w:bp:bd #', 'write and close buffer', noremap = true, silent = false }, - p = { ':CocList -A --normal yank', 'CoC paste', noremap = true, silent = true }, - u = { ':UndotreeShow', 'undotree', noremap = true, silent = true }, - v = { ':FloatermNew vifm', 'vifm', noremap = true, silent = true }, - w = { ':w', 'write buffer', noremap = true, silent = false }, - x = { ':w:bp:bd #', 'write and close buffer', noremap = true, silent = false }, - q = { name = '+coc-fix-current' }, - r = { name = '+coc-rename' }, - g = { - name = 'grep', - a = { ':Ag', 'the_silver_searcher', noremap = true, silent = true }, - g = { ':Grep', 'grep', noremap = true, silent = true }, - r = { ':Rg', 'ripgrep', noremap = true, silent = true }, - }, -}, { prefix = '' }) - -vim.keymap.set('n', 'M-;', ':call nerdcommenter#Comment(0,"toggle")', { noremap = true, silent = false }) -vim.keymap.set('n', 'M-x', ':', { noremap = true, silent = false }) +vim.keymap.set('n', '', ':call nerdcommenter#Comment(0,"toggle")', { noremap = true, silent = false }) +vim.keymap.set('n', '', ':', { noremap = true, silent = false }) vim.keymap.set('n', '', ':bprevious', { noremap = true, silent = true }) vim.keymap.set('n', '', ':bnext', { noremap = true, silent = true }) vim.keymap.set('n', '', 'h', { noremap = true, silent = false }) diff --git a/.config/nvim/lua/plugs-config/lualine.lua b/.config/nvim/lua/plugs-config/lualine.lua index 3bb6922..9f706f2 100644 --- a/.config/nvim/lua/plugs-config/lualine.lua +++ b/.config/nvim/lua/plugs-config/lualine.lua @@ -82,14 +82,14 @@ ins_left { function() return '▊' end, - color = { fg = colors.blue }, -- Sets highlighting of component + color = { fg = colors.red }, -- Sets highlighting of component padding = { left = 0, right = 1 }, -- We don't need space before this } ins_left { -- mode component function() - return '' + return '󱓞' end, color = function() -- auto change color according to neovims mode diff --git a/.config/nvim/lua/plugs-config/whichkey.lua b/.config/nvim/lua/plugs-config/whichkey.lua new file mode 100644 index 0000000..f81b879 --- /dev/null +++ b/.config/nvim/lua/plugs-config/whichkey.lua @@ -0,0 +1,27 @@ +local wk = require("which-key") +wk.register({ + b = { ':Buffers', 'buffers', noremap = true, silent = true }, + c = { name = '+nerd-commenter' }, + d = { ':bd', 'close buffer', noremap = true, silent = false }, + e = { ':Files', 'files', noremap = true, silent = true }, + G = { ':FloatermNew lazygit', 'lazygit', noremap = true, silent = true }, + h = { ':Startify', 'startify', noremap = true, silent = true }, + k = { ':w:bp:bd #', 'write and close buffer', noremap = true, silent = false }, + p = { ':CocList -A --normal yank', 'CoC paste', noremap = true, silent = true }, + u = { ':UndotreeShow', 'undotree', noremap = true, silent = true }, + v = { ':FloatermNew vifm', 'vifm', noremap = true, silent = true }, + w = { ':w', 'write buffer', noremap = true, silent = false }, + x = { ':w:bp:bd #', 'write and close buffer', noremap = true, silent = false }, + q = { name = '+coc-fix-current' }, + r = { name = '+coc-rename' }, + f = { + name = 'telescope', + f = { ':Telescope find_files', 'find files', noremap = true, silent = true }, + }, + g = { + name = 'grep', + a = { ':Ag', 'the_silver_searcher', noremap = true, silent = true }, + g = { ':Grep', 'grep', noremap = true, silent = true }, + r = { ':Rg', 'ripgrep', noremap = true, silent = true }, + }, +}, { prefix = '', }) diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index ece5f6f..3e1bb0e 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -24,7 +24,7 @@ vim.opt.softtabstop = 4 vim.opt.ruler = true vim.opt.tabstop = 4 vim.opt.textwidth = 80 -vim.opt.timeoutlen = 500 +vim.opt.timeoutlen = 250 vim.opt.undodir = '/tmp/nvim_undo' vim.opt.undofile = true vim.opt.wildmode = 'longest,list,full' -- cgit v1.2.3