vim: add global telescope helpers

3 files changed, 30 insertions, 14 deletions

diff --git a/.vim/lua/job.lua b/.vim/lua/job.lua
index b6c34f7..9a235c4 100644
--- a/.vim/lua/job.lua
+++ b/.vim/lua/job.lua
@@ -6,9 +6,12 @@ local M = {
   current_jobs = {}
 }
 
-function M.jobstart(opts, _wrap_command_for_presentation)
-  local opts = opts or {}
+--create a new job and register
+--@return /usr/local/share/nvim/site/pack/packer/start/plenary.nvim/lua/plenary/job.lua
+function M.jobstart(opts)
+  opts = opts or {}
 
+  local title
   if opts.format_title then
     title = opts.format_title(opts.command, opts.args)
     opts.format_title = nil
@@ -18,7 +21,7 @@ function M.jobstart(opts, _wrap_command_for_presentation)
 
   opts.enable_recording = true -- enable job:result()
 
-  opts.on_exit = vim.schedule_wrap(function(j, retval)
+  opts.on_exit = vim.schedule_wrap(function(j, _)
     spinner.on_progress('end', j.pid, j.pid)
     spinner.on_exit(nil, nil, j.pid)
 
diff --git a/.vim/lua/misc.lua b/.vim/lua/misc.lua
index 0067efb..d1686c2 100644
--- a/.vim/lua/misc.lua
+++ b/.vim/lua/misc.lua
@@ -57,4 +57,14 @@ function M.sort_line()
   end
 end
 
+function M.live_grep(dirs)
+  dirs = dirs or vim.fn.input('Dirs: ')
+  require('telescope.builtin').live_grep {search_dirs=vim.split(dirs, ',')}
+end
+
+function M.find_files(dirs)
+  dirs = dirs or vim.fn.input('Dirs: ')
+  require('telescope.builtin').find_files {search_dirs=vim.split(dirs, ',')}
+end
+
 return M
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 14afe8a..157cb59 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -259,7 +259,7 @@ return require('packer').startup({function()
       'nvim-lua/popup.nvim',
       'nvim-lua/plenary.nvim',
       -- telescope plugins:
-      'nvim-telescope/telescope-fzf-writer.nvim',
+      -- 'nvim-telescope/telescope-fzf-writer.nvim',
     },
     config = function()
       local nnoremap = require('astronauta.keymap').nnoremap
@@ -307,18 +307,19 @@ return require('packer').startup({function()
         }
       }
 
-      nnoremap { ';q', require('telescope.builtin').quickfix }
-      nnoremap { ';c', require('telescope.builtin').loclist }
+      nnoremap { ';Q', require('telescope.builtin').quickfix }
+      nnoremap { ';C', require('telescope.builtin').loclist }
 
-      nnoremap { ';g', require('telescope').extensions.fzf_writer.staged_grep }
+      nnoremap { ';H', require('telescope.builtin').help_tags }
+      nnoremap { ';b', require('telescope.builtin').buffers }
+      nnoremap { ';c', require('telescope.builtin').commands }
       nnoremap { ';f', require('telescope.builtin').fd }
+      nnoremap { ';g', require('telescope.builtin').live_grep }
+      nnoremap { ';h', require('telescope.builtin').command_history }
       nnoremap { ';l', require('telescope.builtin').current_buffer_fuzzy_find }
-      nnoremap { ';w', require('telescope.builtin').file_browser }
-      nnoremap { ';b', require('telescope.builtin').buffers }
+      nnoremap { ';o', require('telescope.builtin').oldfiles }
       nnoremap { ';t', require('telescope.builtin').tags }
-      nnoremap { ';h', require('telescope.builtin').command_history }
-      nnoremap { ';H', require('telescope.builtin').help_tags }
-      nnoremap { ';c', require('telescope.builtin').commands }
+      nnoremap { ';w', require('telescope.builtin').file_browser }
 
       nnoremap { ';v', function()
           require('telescope.builtin').find_files({
@@ -329,8 +330,9 @@ return require('packer').startup({function()
         end }
 
       -- LSP stuff
+      nnoremap { ';s', require('telescope.builtin').lsp_workspace_symbols }
       nnoremap { ';a', require('telescope.builtin').lsp_code_actions }
-      nnoremap { ';0', require('telescope.builtin').lsp_document_symbols }
+      nnoremap { ';d', require('telescope.builtin').lsp_workspace_diagnostics }
       nnoremap { ';r', require('telescope.builtin').lsp_references }
     end} -- }}}
 
@@ -422,6 +424,7 @@ return require('packer').startup({function()
     end} -- }}}
 
   use {'kristijanhusak/orgmode.nvim', -- {{{
+    ft = {'org'},
     config = function()
       local nnoremap = require('astronauta.keymap').nnoremap
 
@@ -446,7 +449,7 @@ return require('packer').startup({function()
       local pickers = require('telescope.pickers')
       local finders = require('telescope.finders')
 
-      nnoremap { ';o', function()
+      nnoremap { ';O', function()
           pickers.new(opts, {
             prompt_title = 'Orgmode',
             finder = finders.new_table(require('orgmode.config'):get_all_files()),