diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 0764159..cccf4f8 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -84,8 +84,8 @@ nnoremap Bdelete nnoremap TroubleToggle workspace_diagnostics nnoremap call ToggleQuickfixList() nnoremap noh -nnoremap 10j -nnoremap 10k +map 10j +map 10k nnoremap ff Telescope find_files nnoremap fg Telescope live_grep @@ -98,5 +98,8 @@ nnoremap ll lua vim.lsp.buf. nnoremap lh lua vim.lsp.buf.hover() nnoremap lf lua vim.lsp.buf.formatting() -highlight! CmpItemAbbrMatch ctermfg=cyan -highlight! CmpItemAbbrMatchFuzzy ctermfg=cyan +highlight! CmpItemAbbrMatch ctermfg=Cyan +highlight! CmpItemAbbrMatchFuzzy ctermfg=Cyan +highlight! NvimTreeFolderName ctermfg=Blue +highlight! NvimTreeOpenedFolderName ctermfg=Blue cterm=bold +highlight! NvimTreeEmptyFolderName ctermfg=Blue diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index ded7d79..dc7234a 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -17,7 +17,6 @@ require('packer').startup(function() use { 'kyazdani42/nvim-tree.lua', requires = { - 'kyazdani42/nvim-web-devicons', -- optional, for file icon }, config = function() require'nvim-tree'.setup { auto_close = true, @@ -45,7 +44,6 @@ require('packer').startup(function() use 'ray-x/lsp_signature.nvim' use { "folke/trouble.nvim", - requires = "kyazdani42/nvim-web-devicons", config = function() require("trouble").setup { signs = { @@ -76,15 +74,17 @@ vim.api.nvim_set_keymap('n', 'k', "v:count == 0 ? 'gk' : 'k'", { noremap = true, vim.api.nvim_set_keymap('n', 'j', "v:count == 0 ? 'gj' : 'j'", { noremap = true, expr = true, silent = true }) require('telescope').setup { - extensions = { - fzf = { - fuzzy = true, -- false will only do exact matching - override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "smart_case", -- or "ignore_case" or "respect_case" - -- the default case_mode is "smart_case" - } - } + defaults = { + }, + extensions = { + fzf = { + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" + -- the default case_mode is "smart_case" + } + } } -- To get fzf loaded and working with telescope, you need to call -- load_extension, somewhere after setup function: @@ -249,6 +249,7 @@ cmp.setup { formatting = { format = lspkind.cmp_format({ with_text = true, + mode = "text", menu = ({ buffer = "[Buffer]", nvim_lsp = "[LSP]", diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index 1a72e26..45a6264 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -155,11 +155,6 @@ _G.packer_plugins = { path = "/home/tim/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring", url = "https://github.com/JoosepAlviste/nvim-ts-context-commentstring" }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/tim/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, ["packer.nvim"] = { loaded = true, path = "/home/tim/.local/share/nvim/site/pack/packer/start/packer.nvim", @@ -244,14 +239,14 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\1\2J\0\0\2\0\4\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\3\0>\0\2\1G\0\1\0\1\0\1\15auto_close\2\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) -- Config for: trouble.nvim time([[Config for trouble.nvim]], true) try_loadstring("\27LJ\1\2\1\0\0\3\0\6\0\t4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\4\0003\2\3\0:\2\5\1>\0\2\1G\0\1\0\nsigns\1\0\0\1\0\4\16information\tinfo\thint\thint\fwarning\twarn\nerror\nerror\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") time([[Config for trouble.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\1\2J\0\0\2\0\4\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\3\0>\0\2\1G\0\1\0\1\0\1\15auto_close\2\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) if should_profile then save_profiles() end end)