up

5 files changed, 34 insertions, 30 deletions

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<CR>', 'buffers', noremap = true, silent = true },
-	c = { name = '+nerd-commenter' },
-	d = { ':bd<CR>', 'close buffer', noremap = true, silent = false },
-	e = { ':Files<CR>', 'files', noremap = true, silent = true },
-	G = { ':FloatermNew lazygit<CR>', 'lazygit', noremap = true, silent = true },
-	h = { ':Startify<CR>', 'startify', noremap = true, silent = true },
-	k = { ':w<CR>:bp<CR>:bd #<CR>', 'write and close buffer', noremap = true, silent = false },
-	p = { ':<C-u>CocList -A --normal yank<CR>', 'CoC paste', noremap = true, silent = true },
-	u = { ':UndotreeShow<CR>', 'undotree', noremap = true, silent = true },
-	v = { ':FloatermNew vifm<CR>', 'vifm', noremap = true, silent = true },
-	w = { ':w<CR>', 'write buffer', noremap = true, silent = false },
-	x = { ':w<CR>:bp<CR>:bd #<CR>', 'write and close buffer', noremap = true, silent = false },
-	q = { name = '+coc-fix-current' },
-	r = { name = '+coc-rename' },
-	g = {
-		name = 'grep',
-		a = { ':Ag<CR>', 'the_silver_searcher', noremap = true, silent = true },
-		g = { ':Grep<CR>', 'grep', noremap = true, silent = true },
-		r = { ':Rg<CR>', 'ripgrep', noremap = true, silent = true },
-	},
-}, { prefix = '<leader>' })
-
-vim.keymap.set('n', 'M-;', ':call nerdcommenter#Comment(0,"toggle")<CR>', { noremap = true, silent = false })
-vim.keymap.set('n', 'M-x', ':', { noremap = true, silent = false })
+vim.keymap.set('n', '<M-;>', ':call nerdcommenter#Comment(0,"toggle")<CR>', { noremap = true, silent = false })
+vim.keymap.set('n', '<M-x>', ':', { noremap = true, silent = false })
 vim.keymap.set('n', '<M-k>', ':bprevious<CR>', { noremap = true, silent = true })
 vim.keymap.set('n', '<M-j>', ':bnext<CR>', { noremap = true, silent = true })
 vim.keymap.set('n', '<C-h>', '<C-w>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<CR>', 'buffers', noremap = true, silent = true },
+	c = { name = '+nerd-commenter' },
+	d = { ':bd<CR>', 'close buffer', noremap = true, silent = false },
+	e = { ':Files<CR>', 'files', noremap = true, silent = true },
+	G = { ':FloatermNew lazygit<CR>', 'lazygit', noremap = true, silent = true },
+	h = { ':Startify<CR>', 'startify', noremap = true, silent = true },
+	k = { ':w<CR>:bp<CR>:bd #<CR>', 'write and close buffer', noremap = true, silent = false },
+	p = { ':<C-u>CocList -A --normal yank<CR>', 'CoC paste', noremap = true, silent = true },
+	u = { ':UndotreeShow<CR>', 'undotree', noremap = true, silent = true },
+	v = { ':FloatermNew vifm<CR>', 'vifm', noremap = true, silent = true },
+	w = { ':w<CR>', 'write buffer', noremap = true, silent = false },
+	x = { ':w<CR>:bp<CR>:bd #<CR>', 'write and close buffer', noremap = true, silent = false },
+	q = { name = '+coc-fix-current' },
+	r = { name = '+coc-rename' },
+	f = {
+		name = 'telescope',
+		f = { ':Telescope find_files<CR>', 'find files', noremap = true, silent = true },
+	},
+	g = {
+		name = 'grep',
+		a = { ':Ag<CR>', 'the_silver_searcher', noremap = true, silent = true },
+		g = { ':Grep<CR>', 'grep', noremap = true, silent = true },
+		r = { ':Rg<CR>', 'ripgrep', noremap = true, silent = true },
+	},
+}, { prefix = '<leader>', })
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'