up

4 files changed, 23 insertions, 17 deletions

diff --git a/.config/nvim/lua/plug.lua b/.config/nvim/lua/plug.lua
index c411e02..d28841e 100644
--- a/.config/nvim/lua/plug.lua
+++ b/.config/nvim/lua/plug.lua
@@ -36,6 +36,7 @@ Plug('vifm/vifm.vim')
 -- Plug('vim-airline/vim-airline')
 -- Plug('vim-airline/vim-airline-themes')
 Plug('nvim-lualine/lualine.nvim')
+Plug('folke/trouble.nvim')
 Plug('vim-scripts/grep.vim')
 Plug('voldikss/fzf-floaterm')
 Plug('voldikss/vim-floaterm')
diff --git a/.config/nvim/lua/plugs-config/lualine.lua b/.config/nvim/lua/plugs-config/lualine.lua
index 3ea3a87..56e7d83 100644
--- a/.config/nvim/lua/plugs-config/lualine.lua
+++ b/.config/nvim/lua/plugs-config/lualine.lua
@@ -158,10 +158,6 @@ ins_left {
   color = { fg = colors.magenta, gui = 'bold' },
 }
 
-ins_left { 'location' }
-
-ins_left { 'progress', color = { fg = colors.fg, gui = 'bold' } }
-
 ins_left {
   'diagnostics',
   sources = { 'nvim_diagnostic' },
@@ -199,21 +195,12 @@ ins_left {
     return msg
   end,
   icon = '  LSP:',
-  color = { fg = '#ffffff', gui = 'bold' },
-}
-
--- Add components to right sections
-ins_right {
-  'o:encoding', -- option component same as &encoding in viml
-  fmt = string.upper, -- I'm not sure why it's upper case either ;)
-  cond = conditions.hide_in_width,
-  color = { fg = colors.green, gui = 'bold' },
+  color = { fg = colors.darkblue },
 }
 
 ins_right {
-  'fileformat',
-  fmt = string.upper,
-  icons_enabled = false, -- I think icons are cool but Eviline doesn't have them. sigh
+  'filetype',
+  icons_enabled = true, -- I think icons are cool but Eviline doesn't have them. sigh
   color = { fg = colors.green, gui = 'bold' },
 }
 
@@ -235,6 +222,8 @@ ins_right {
   cond = conditions.hide_in_width,
 }
 
+ins_right { 'location' }
+
 ins_right {
   function()
     return '▊'
diff --git a/.config/nvim/lua/plugs-config/whichkey.lua b/.config/nvim/lua/plugs-config/whichkey.lua
index f81b879..9529229 100644
--- a/.config/nvim/lua/plugs-config/whichkey.lua
+++ b/.config/nvim/lua/plugs-config/whichkey.lua
@@ -1,3 +1,4 @@
+
 local wk = require("which-key")
 wk.register({
 	b = { ':Buffers<CR>', 'buffers', noremap = true, silent = true },
@@ -25,3 +26,18 @@ wk.register({
 		r = { ':Rg<CR>', 'ripgrep', noremap = true, silent = true },
 	},
 }, { prefix = '<leader>', })
+wk.setup({
+	plugins = {
+		presets = {
+			operators = false,
+			motions = false,
+			text_objects = false,
+			window = false,
+			nav = false,
+			z = false,
+			g = false
+		},
+	},
+	triggers = { "<leader>" },
+	triggers_nowait = { "d" },
+})
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 3e1bb0e..992f96d 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 = 250
+vim.opt.timeoutlen = 0
 vim.opt.undodir = '/tmp/nvim_undo'
 vim.opt.undofile = true
 vim.opt.wildmode = 'longest,list,full'