From f96f05c95f381a0dec10474e152931c3f170fe8e Mon Sep 17 00:00:00 2001
From: Joshua Potter <jrpotter2112@gmail.com>
Date: Fri, 24 Nov 2023 09:52:34 -0700
Subject: [PATCH] Add telescope mappings, drop DAP adapter name and widget
 closing.

---
 jrpotter/neovim/lua/init/dap.lua       | 8 --------
 jrpotter/neovim/lua/init/evil.lua      | 2 +-
 jrpotter/neovim/lua/init/telescope.lua | 9 +++++++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/jrpotter/neovim/lua/init/dap.lua b/jrpotter/neovim/lua/init/dap.lua
index 954a2be..5fa834f 100644
--- a/jrpotter/neovim/lua/init/dap.lua
+++ b/jrpotter/neovim/lua/init/dap.lua
@@ -149,14 +149,6 @@ function M.buffer_map()
   set_nnoremap('wt', function()
     toggle_sidebar(sidebars.threads)
   end)
-  set_nnoremap('wx', function()
-    for _, sb in pairs(sidebars) do
-      if sidebar_is_open(sb) then
-        toggle_sidebar(sb)
-      end
-      dap.repl.close()
-    end
-  end)
 end
 
 return M
diff --git a/jrpotter/neovim/lua/init/evil.lua b/jrpotter/neovim/lua/init/evil.lua
index f3f447e..31e609c 100644
--- a/jrpotter/neovim/lua/init/evil.lua
+++ b/jrpotter/neovim/lua/init/evil.lua
@@ -168,7 +168,7 @@ ins_left {
     local lsp_name = get_active_lsp().name
     local has_dap, dap = pcall(require, 'dap')
     if has_dap and dap.status() ~= "" then
-      return string.format("%s:%s", lsp_name, dap.session().adapter.name)
+      return string.format("%s", lsp_name)
     else
       return lsp_name
     end
diff --git a/jrpotter/neovim/lua/init/telescope.lua b/jrpotter/neovim/lua/init/telescope.lua
index 0202be9..2c0a9c8 100644
--- a/jrpotter/neovim/lua/init/telescope.lua
+++ b/jrpotter/neovim/lua/init/telescope.lua
@@ -32,17 +32,22 @@ function M.setup()
       lsp_definitions = { theme = 'cursor' },
       lsp_implementations = { theme = 'cursor' },
       lsp_type_definitions = { theme = 'cursor' },
+      lsp_workspace_symbols = { theme = 'ivy' },
     },
   }
 
+  -- General
   set_telescope_map(';', 'resume')
   set_telescope_map('b', 'buffers')
   set_telescope_map('f', 'find_files')
+  set_telescope_map('g', 'live_grep')
 
-  set_telescope_map('s', 'live_grep')
-  set_telescope_map('d', 'lsp_type_definitions')
+  -- LSP
+  set_telescope_map('?', 'diagnostics')
   set_telescope_map(']', 'lsp_definitions')
   set_telescope_map('i', 'lsp_implementations')
+  set_telescope_map('s', 'lsp_workspace_symbols')
+  set_telescope_map('t', 'lsp_type_definitions')
 
   vim.api.nvim_create_autocmd('User', {
     pattern = 'TelescopePreviewerLoaded',