diff --git a/dot_config/nvim/lua/configs/colors.lua b/dot_config/nvim/lua/configs/colors.lua index b2bb903..64ec33d 100644 --- a/dot_config/nvim/lua/configs/colors.lua +++ b/dot_config/nvim/lua/configs/colors.lua @@ -149,6 +149,10 @@ vim.api.nvim_create_autocmd('Colorscheme', { vim.api.nvim_set_hl(0, 'Directory', { link = 'GruvboxGreen' }) vim.api.nvim_set_hl(0, 'TelescopeSelection', { link = 'GruvboxOrangeSign' }) vim.api.nvim_set_hl(0, 'TelescopeMatching', { link = 'GruvboxAqua' }) + + vim.api.nvim_set_hl(0, 'NeoTreeGitAdded', { link = 'GruvboxGreen' }) + vim.api.nvim_set_hl(0, 'NeoTreeGitDeleted', { link = 'GruvboxRed' }) + vim.api.nvim_set_hl(0, 'NeoTreeGitModified', { link = 'GruvboxOrange' }) end }) diff --git a/dot_config/nvim/lua/configs/packages.lua b/dot_config/nvim/lua/configs/packages.lua index 348dada..28eb238 100644 --- a/dot_config/nvim/lua/configs/packages.lua +++ b/dot_config/nvim/lua/configs/packages.lua @@ -52,13 +52,14 @@ function M.setup() use 'ray-x/lsp_signature.nvim' use { 'RishabhRD/nvim-lsputils', requires = { 'RishabhRD/popfix' } } - use { 'stevearc/dressing.nvim', config = function() - require('dressing').setup({ - input = { - relative = 'editor', - }, - }) - end } + -- use { 'stevearc/dressing.nvim', config = function() + -- require('dressing').setup({ + -- input = { + -- relative = 'editor', + -- }, + -- }) + -- end } + use { 'jose-elias-alvarez/null-ls.nvim', requires = { 'nvim-lua/plenary.nvim' }, config = require('configs.null-ls').setup } @@ -74,6 +75,7 @@ function M.setup() requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim' }, config = require('configs.telescope').setup, } + use { 'nvim-telescope/telescope-ui-select.nvim' } 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' } diff --git a/dot_config/nvim/lua/configs/telescope.lua b/dot_config/nvim/lua/configs/telescope.lua index 899f48c..afae6cf 100644 --- a/dot_config/nvim/lua/configs/telescope.lua +++ b/dot_config/nvim/lua/configs/telescope.lua @@ -1,23 +1,16 @@ local M = {} function M.setup() + local telescope = require('telescope') vim.api.nvim_set_keymap('n', 'b', [[Telescope buffers]], { noremap = true, silent = true }) vim.api.nvim_set_keymap('n', 'f', [[Telescope fd]], { noremap = true, silent = true }) vim.api.nvim_set_keymap('n', 'T', [[Telescope]], { noremap = true, silent = true }) - require('telescope').setup { + telescope.setup { defaults = { preview = { hide_on_startup = true }, - --[[ mappings = { -i = { -[""] = actions.toggle_preview, -}, -n = { -[""] = actions.toggle_preview, -}, -}, ]] }, pickers = { buffers = { @@ -30,21 +23,33 @@ n = { n = { [''] = 'delete_buffer', } } } + }, + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown {} + } + } } - require('telescope').load_extension('fzf') + telescope.load_extension('fzf') + telescope.load_extension('ui-select') - --[[ local telescope_ag = vim.api.nvim_create_augroup('Telescope') -nvim.nvim_create_autocmd('FileType', { pattern='TelescopePrompt', command = nvim.nvim_buf_set_keymap('n', '' ]] - vim.cmd 'augroup Telescope' - vim.cmd 'autocmd FileType TelescopePrompt inoremap Telescope buffers initial_mode=insert' - vim.cmd 'autocmd FileType TelescopePrompt inoremap Telescope fd initial_mode=insert' - vim.cmd 'autocmd FileType TelescopePrompt nnoremap Telescope buffers initial_mode=insert' - vim.cmd 'autocmd FileType TelescopePrompt nnoremap Telescope fd initial_mode=insert' - vim.cmd 'autocmd FileType TelescopePrompt inoremap Telescope builtin initial_mode=insert' - vim.cmd 'autocmd FileType TelescopePrompt nnoremap Telescope builtin initial_mode=insert' - vim.cmd 'augroup END' + local augr = vim.api.nvim_create_augroup('Telescope', {}) + vim.api.nvim_create_autocmd('FileType', { + group = augr, + pattern = 'TelescopePrompt', + callback = function() + vim.api.nvim_exec([[ + imap Telescope buffers initial_mode=insert + nmap Telescope buffers initial_mode=insert + imap Telescope fd initial_mode=insert + nmap Telescope fd initial_mode=insert + imap Telescope builtin initial_mode=insert + nmap Telescope builtin initial_mode=insert + ]], false) + end + }) end