diff --git a/Makefile b/Makefile index 821b9ff..8370f9b 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,7 @@ alacritty: ln -s $(PWD)/sub/alacritty/alacritty.yml ~/.config/alacritty/ vim: - echo "sudo pacman -S npm ctags; mkdir ~/.npm-global; npm config set prefix '~/.npm-global'; npm install -g pyright" - echo "go install golang.org/x/tools/gopls@latest" + echo "sudo pacman -S npm ctags fzf; mkdir ~/.npm-global; npm config set prefix '~/.npm-global'; npm install -g pyright" echo "set editing-mode vi" >> ~/.inputrc test -d ~/.vim || \ ln -s $(PWD)/sub/vim ~/.vim diff --git a/sub/vim/init.lua b/sub/vim/init.lua index c090648..8713493 100644 --- a/sub/vim/init.lua +++ b/sub/vim/init.lua @@ -125,3 +125,6 @@ for _, lsp in ipairs(servers) do } } end + + +require('telescope').load_extension('fzf') diff --git a/sub/vim/vimrc b/sub/vim/vimrc index 910f113..36d1f4f 100644 --- a/sub/vim/vimrc +++ b/sub/vim/vimrc @@ -100,12 +100,14 @@ call vundle#begin() Plugin 'hrsh7th/cmp-nvim-lsp' Plugin 'saadparwaiz1/cmp_luasnip' Plugin 'L3MON4D3/LuaSnip' + Plugin 'nvim-lua/plenary.nvim' Plugin 'powerman/vim-plugin-ruscmd' " Russian navigation " golang " Plugin 'fatih/vim-go' - + Plugin 'nvim-telescope/telescope.nvim' + Plugin 'nvim-telescope/telescope-fzf-native.nvim', {'do': 'make'} call vundle#end() @@ -131,6 +133,7 @@ nnoremap :Ranger let g:ranger_replace_netrw = 1 " open ranger when vim open a directory let g:ranger_map_keys = 0 +let g:ranger_open_new_tab = 1 " ctags required nnoremap :TagbarToggle @@ -185,4 +188,9 @@ hi DiagnosticInfo guifg=Grey hi DiagnosticHint guifg=Grey + +nnoremap ,ff Telescope find_files +nnoremap ,fg Telescope live_grep + + luafile ~/.config/nvim/lua/init.lua