From 5b162e7241aff9c0eae58c4321e63d7a05742f73 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 3 May 2022 08:57:22 +0100
Subject: [PATCH] chore(nvim): update Telescope config and mappings

---
 .../files/lua/opdavies/telescope/init.lua     | 19 +++++++++++++-
 .../files/lua/opdavies/telescope/mappings.lua |  3 ++-
 .../files/lua/opdavies/telescope/setup.lua    | 25 +------------------
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/roles/neovim/files/lua/opdavies/telescope/init.lua b/roles/neovim/files/lua/opdavies/telescope/init.lua
index aea813ae..1ba83c36 100644
--- a/roles/neovim/files/lua/opdavies/telescope/init.lua
+++ b/roles/neovim/files/lua/opdavies/telescope/init.lua
@@ -12,12 +12,22 @@ local themes = require "telescope.themes"
 
 local M = {}
 
+function M.current_buf()
+  local opts = {
+    sorting_strategy = "ascending",
+    previewer = false,
+  }
+
+  require "telescope.builtin".current_buffer_fuzzy_find(opts)
+end
+
 function M.edit_neovim()
   local opts = {
     cwd = "~/.config/nvim",
     find_command = { "rg", "--no-ignore", "--files", "--follow" },
     path_display = { "shorten" },
     prompt_title = "~ dotfiles ~",
+    no_ignore = true,
 
     layout_strategy = "flex",
     layout_config = {
@@ -47,13 +57,20 @@ function M.file_browser()
 end
 
 function M.fd()
-  local opts = themes.get_ivy()
+  local opts = themes.get_ivy {
+    file_ignore_patterns = { ".git/" },
+    hidden = true,
+    no_ignore = true,
+  }
 
   require("telescope.builtin").find_files(opts)
 end
 
 function M.live_grep()
   require("telescope.builtin").live_grep {
+    file_ignore_patterns = { ".git/" },
+    hidden = true,
+    no_ignore = true,
     sorting_strategy = "ascending",
   }
 end
diff --git a/roles/neovim/files/lua/opdavies/telescope/mappings.lua b/roles/neovim/files/lua/opdavies/telescope/mappings.lua
index 0226eb43..843917be 100644
--- a/roles/neovim/files/lua/opdavies/telescope/mappings.lua
+++ b/roles/neovim/files/lua/opdavies/telescope/mappings.lua
@@ -21,11 +21,12 @@ local telescope_mapper = function(key, f, options, buffer)
 end
 
 telescope_mapper("<leader>fb", "buffers")
+telescope_mapper("<leader>fd", "fd")
 telescope_mapper("<leader>fe", "file_browser")
+telescope_mapper("<leader>ff", "current_buf")
 telescope_mapper("<leader>fg", "git_files")
 telescope_mapper("<leader>fh", "help_tags")
 telescope_mapper("<leader>fl", "live_grep")
-telescope_mapper("<leader>ff", "fd")
 
 telescope_mapper("<leader>en", "edit_neovim")
 telescope_mapper("<leader>ez", "edit_zsh")
diff --git a/roles/neovim/files/lua/opdavies/telescope/setup.lua b/roles/neovim/files/lua/opdavies/telescope/setup.lua
index 89d89203..eaf4bad6 100644
--- a/roles/neovim/files/lua/opdavies/telescope/setup.lua
+++ b/roles/neovim/files/lua/opdavies/telescope/setup.lua
@@ -31,6 +31,7 @@ end
 telescope.setup {
   defaults = {
     buffer_previewer_maker = new_maker,
+    no_ignore = true,
     prompt_prefix = "$ ",
   },
   extensions = {
@@ -43,27 +44,3 @@ telescope.setup {
 telescope.load_extension "file_browser"
 telescope.load_extension "fzf"
 telescope.load_extension "refactoring"
-
--- local map = vim.api.nvim_set_keymap
---
--- local options = {
---   noremap = true,
---   silent = true,
--- }
---
--- local nmap = require "opdavies.keymap".nmap
--- local tele_mappings = R "opdavies.telescope.mappings"
---
--- -- Builtin
--- nmap({ "<leader>fb", '<cmd>lua require("telescope.builtin").buffers()<cr>', opts })
--- nmap({ "<leader>fc", '<cmd>lua require("telescope.builtin").lsp_code_actions()<cr>', opts })
--- nmap({ "<leader>fd", '<cmd>lua require("telescope.builtin").lsp_workspace_diagnostics()<cr>', opts })
--- nmap({ "<leader>fg", '<cmd>lua require("telescope.builtin").git_files{}<cr>', opts })
--- nmap({ "<leader>fh", '<cmd>lua require("telescope.builtin").help_tags()<cr>', opts })
--- nmap({ "<leader>fl", '<cmd>lua require("telescope.builtin").live_grep({ sorting_strategy="ascending" })<cr>', opts })
--- nmap({ "<leader>fr", '<cmd>lua require("telescope.builtin").registers()<cr>', opts })
---
--- -- Custom
--- nmap({ "<leader>fe", tele_mappings.file_browser, opts })
--- nmap({ "<Leader>en", tele_mappings.edit_neovim, opts })
--- nmap({ "<Leader>ff", tele_mappings.fd, opts })