diff --git a/config/.config/nvim/lua/telescope_config.lua b/config/.config/nvim/lua/telescope_config.lua index b108471..4e84e14 100644 --- a/config/.config/nvim/lua/telescope_config.lua +++ b/config/.config/nvim/lua/telescope_config.lua @@ -39,41 +39,11 @@ require('telescope').setup { } -- These custom mappings let you open telescope-codesearch quickly: --- Fuzzy find files in codesearch. -vim.api.nvim_set_keymap('n', 'ss', - [[lua require('telescope').extensions.codesearch.find_files{}]], - { noremap = true, silent=true } -) - vim.api.nvim_set_keymap('n', '', [[lua require('telescope').extensions.codesearch.find_files{}]], { noremap = true, silent=true } ) --- Search using codesearch queries. -vim.api.nvim_set_keymap('n', 'sd', - [[lua require('telescope').extensions.codesearch.find_query{}]], - { noremap = true, silent=true } -) - --- Search for the word under cursor. -vim.api.nvim_set_keymap('n', 'sD', -[[lua require('telescope').extensions.codesearch.find_query{default_text_expand=''}]], -{ noremap = true, silent=true } -) - --- Search for a file having word under cursor in its name. -vim.api.nvim_set_keymap('n', 'sS', -[[lua require('telescope').extensions.codesearch.find_files{default_text_expand=''}]], -{ noremap = true, silent=true } -) - --- Search for text selected in Visual mode. -vim.api.nvim_set_keymap('v', 'sd', -[[lua require('telescope').extensions.codesearch.find_query{}]], -{ noremap = true, silent=true } -) - -- Search using codesearch queries. vim.api.nvim_set_keymap( "n", @@ -81,6 +51,14 @@ vim.api.nvim_set_keymap( [[lua require('telescope').extensions.codesearch.find_query{}]], { noremap = true, silent = true } ) +-- +-- Search for files using codesearch queries. +vim.api.nvim_set_keymap( + "n", + "cf", + [[lua require('telescope').extensions.codesearch.find_files{}]], + { noremap = true, silent = true } +) -- Search for the word under cursor. vim.api.nvim_set_keymap( @@ -93,7 +71,7 @@ vim.api.nvim_set_keymap( -- Search for a file having word under cursor in its name. vim.api.nvim_set_keymap( "n", - "csS", + "CF", [[lua require('telescope').extensions.codesearch.find_files{default_text_expand=''}]], { noremap = true, silent = true } ) @@ -105,3 +83,11 @@ vim.api.nvim_set_keymap( [[lua require('telescope').extensions.codesearch.find_query{}]], { noremap = true, silent = true } ) + +-- Search for file having text selected in Visual mode. +vim.api.nvim_set_keymap( + "v", + "cf", + [[lua require('telescope').extensions.codesearch.find_files{}]], + { noremap = true, silent = true } +) diff --git a/vim/.vimrc b/vim/.vimrc index dcb5950..121fa96 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -100,7 +100,6 @@ call plug#end() " required " IMPORTANT: Must come after plugins are loaded lua << EOF -- CiderLSP - vim.lsp.set_log_level("trace") vim.opt.completeopt = { "menu", "menuone", "noselect" } require 'lspconfig' diff --git a/zsh/.zshrc b/zsh/.zshrc index 20bdf7a..81052c2 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -250,3 +250,5 @@ autoload -Uz add-zsh-hook export FZF_DEFAULT_OPTS="--preview 'echo {}' --preview-window down:3:wrap --bind ?:toggle-preview" source ~/.bash_profile +export ZSH="$HOME/.oh-my-zsh" +source $ZSH/oh-my-zsh.sh