diff --git a/init.lua b/init.lua index 4c5e4bd..7481adb 100644 --- a/init.lua +++ b/init.lua @@ -6,6 +6,8 @@ require('utils.lua') require('nvimTree.lua') require('bufferline.lua') require('statusline.lua') +require('telescope-nvim.lua') + -- lsp require('nvim-lspconfig.lua') @@ -28,9 +30,8 @@ g.auto_save = 1 g.indentLine_enabled = 1 g.indentLine_char_list = {'▏'} -g.mapleader = "b" -g.maplocalleader = "b" +g.mapleader = ' ' require('treesitter.lua') require('mappings.lua') @@ -44,6 +45,11 @@ cmd("highlight DiffChange guifg =#3A3E44 guibg = none") cmd("highlight DiffModified guifg = #81A1C1 guibg = none") cmd("hi EndOfBuffer guifg=#282c34") +cmd("highlight TelescopeBorder guifg=#3e4451") +cmd("highlight TelescopePromptBorder guifg=#3e4451") +cmd("highlight TelescopeResultsBorder guifg=#3e4451") +cmd("highlight TelescopePreviewBorder guifg=#525865") + -- tree folder name , icon color cmd("highlight NvimTreeFolderIcon guifg = #61afef") cmd("highlight NvimTreeFolderName guifg = #61afef") @@ -51,27 +57,5 @@ cmd("highlight NvimTreeFolderName guifg = #61afef") require('nvim-autopairs').setup() require('lspkind').init({ - -- with_text = true, - -- symbol_map = { - -- Text = '', - -- Method = 'ƒ', - -- Function = '', - -- Constructor = '', - -- Variable = '', - -- Class = '', - -- Interface = 'ﰮ', - -- Module = '', - -- Property = '', - -- Unit = '', - -- Value = '', - -- Enum = '了', - -- Keyword = '', - -- Snippet = '﬌', - -- Color = '', File = ' ', - -- Folder = '', - -- EnumMember = '', - -- Constant = '', - -- Struct = '' - -- }, }) diff --git a/lua/mappings/lua.lua b/lua/mappings/lua.lua index c3ea7a2..aad904f 100644 --- a/lua/mappings/lua.lua +++ b/lua/mappings/lua.lua @@ -5,6 +5,5 @@ local function map(mode, lhs, rhs, opts) end -- keybind list - map('', 'c', '"+y') -map('' , 'uu' , 'Neoformat') + diff --git a/lua/pluginsList/lua.lua b/lua/pluginsList/lua.lua index 0e87317..0ced999 100644 --- a/lua/pluginsList/lua.lua +++ b/lua/pluginsList/lua.lua @@ -22,4 +22,7 @@ return require('packer').startup(function() use { 'alvan/vim-closetag'} use { 'tweekmonster/startuptime.vim'} use {'onsails/lspkind-nvim'} + use { 'nvim-telescope/telescope.nvim'} + use {'nvim-telescope/telescope-media-files.nvim'} + use {'nvim-lua/popup.nvim'} end) diff --git a/lua/telescope-nvim/lua.lua b/lua/telescope-nvim/lua.lua new file mode 100644 index 0000000..65dadfb --- /dev/null +++ b/lua/telescope-nvim/lua.lua @@ -0,0 +1,72 @@ + + +require('telescope').setup{ + + defaults = { + vimgrep_arguments = { + 'rg', + '--color=never', + '--no-heading', + '--with-filename', + '--line-number', + '--column', + '--smart-case' + }, + prompt_position = "bottom", + prompt_prefix = "> ", + selection_caret = "> ", + entry_prefix = " ", + initial_mode = "insert", + selection_strategy = "reset", + sorting_strategy = "descending", + layout_strategy = "horizontal", + layout_defaults = { + horizontal = { + mirror = false, + preview_width = 0.5, + }, + vertical = { + mirror = false, + }, + }, + file_sorter = require'telescope.sorters'.get_fuzzy_file, + file_ignore_patterns = {}, + generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, + shorten_path = true, + winblend = 0, + width = 0.75, + preview_cutoff = 120, + results_height = 1, + results_width = 0.8, + border = {}, + borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' }, + color_devicons = true, + use_less = true, + set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil, + file_previewer = require'telescope.previewers'.vim_buffer_cat.new, + grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, + qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, + + -- Developer configurations: Not meant for general override + buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker + }, + + extensions = { + media_files = { + filetypes = {"png", "webp", "jpg", "jpeg"}, + find_cmd = "rg" -- find command (defaults to `fd`) + } + } + + } + +require('telescope').load_extension('media_files') + +local opt = { noremap = true, silent = true } + +vim.g.mapleader = ' ' +vim.api.nvim_set_keymap('n', 'ff', [[lua require('telescope.builtin').find_files()]], opt) +vim.api.nvim_set_keymap('n', 'fp', [[lua require('telescope').extensions.media_files.media_files()]], opt) +vim.api.nvim_set_keymap('n', 'fb', [[lua require('telescope.builtin').buffers()]], opt) +vim.api.nvim_set_keymap('n', 'fh', [[lua require('telescope.builtin').help_tags()]], opt) +vim.api.nvim_set_keymap('n', 'fo', [[lua require('telescope.builtin').oldfiles()]], opt)