diff --git a/nvim/init.lua b/nvim/init.lua index b783939..a6a1e2a 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,6 +1,6 @@ -require('plugins') require('autopairs_config') require('settings') +require('plugins') require('lsp_config') require('telescope_config') require('mappings') diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index 5e6d76e..e88ae89 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -1,5 +1,4 @@ vim.api.nvim_set_keymap("i", "jj", "", {}) -vim.api.nvim_set_keymap("v", "jj", "", {}) vim.api.nvim_set_keymap("n", "j", "gj", {}) vim.api.nvim_set_keymap("n", "k", "gk", {}) vim.api.nvim_set_keymap("n", "", "", {}) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 08c2cfd..9454270 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -34,4 +34,9 @@ require('packer').startup(function(use) use {'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'} use {'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}} use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end} + use { + "folke/trouble.nvim", + requires = "kyazdani42/nvim-web-devicons", + config = function() require("trouble").setup {} end + } end) diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 1b6f988..80d76e2 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -25,7 +25,6 @@ vim.opt.splitbelow = true vim.opt.splitright = true vim.opt.tabstop = 4 vim.opt.ttimeoutlen = 50 -vim.g.signcolumn = "number" vim.opt.undofile = true vim.opt.undolevels = 1000 vim.opt.undoreload = 10000 @@ -35,6 +34,7 @@ vim.g.mapleader = "," vim.g.python_highlight_all = 1 vim.g.solarized_termcolors = 256 vim.g.airline_powerline_fonts = 1 +vim.wo.signcolumn = "number" -- Tab for completion vim.g.SuperTabContextDefaultCompletionType = ""