From 31602d9de6c892a0956fa7c90f36e34d3737d3ba Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 21 Jun 2023 09:00:42 +0100
Subject: [PATCH] chore(nvim): standardise Telescope themes
---
config/neovim/lua/opdavies/telescope/init.lua | 11 ++++++-----
config/neovim/lua/opdavies/telescope/mappings.lua | 1 +
home-manager/modules/common.nix | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/config/neovim/lua/opdavies/telescope/init.lua b/config/neovim/lua/opdavies/telescope/init.lua
index c80a8ab7..048779f8 100644
--- a/config/neovim/lua/opdavies/telescope/init.lua
+++ b/config/neovim/lua/opdavies/telescope/init.lua
@@ -98,7 +98,7 @@ function M.file_browser()
end
function M.find_files()
- local opts = themes.get_ivy {
+ local opts = {
file_ignore_patterns = { ".git/", "**/{core,contrib}", "vendor" },
}
@@ -106,16 +106,17 @@ function M.find_files()
end
function M.find_all_files()
- local opts = themes.get_ivy {
+ local opts = {
no_ignore = true,
+ prompt_title = "All Files",
}
require("telescope.builtin").find_files(opts)
end
function M.git_files()
- local opts = themes.get_ivy {
- file_ignore_patterns = { ".git/", "vendor" },
+ local opts = {
+ file_ignore_patterns = { ".git/", "**/{core,contrib}", "vendor" },
hidden = true,
no_ignore = true,
}
@@ -133,7 +134,7 @@ function M.live_grep()
end
function M.oldfiles()
- local opts = themes.get_ivy {
+ local opts = {
prompt_title = "History",
}
diff --git a/config/neovim/lua/opdavies/telescope/mappings.lua b/config/neovim/lua/opdavies/telescope/mappings.lua
index 3d003070..7e86932b 100644
--- a/config/neovim/lua/opdavies/telescope/mappings.lua
+++ b/config/neovim/lua/opdavies/telescope/mappings.lua
@@ -24,6 +24,7 @@ end
telescope_mapper("<leader>fb", "buffers")
telescope_mapper("<leader>fd", "find_files")
+telescope_mapper("<leader>fD", "find_all_files")
telescope_mapper("<leader>fe", "file_browser")
telescope_mapper("<leader>ff", "current_buf")
telescope_mapper("<leader>fg", "git_files")
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index c63b3251..c185c9dc 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -217,8 +217,8 @@ in
nodePackages.markdownlint-cli
nodePackages.typescript
nodePackages.typescript-language-server
- nodePackages.vue-language-server
nodePackages.vls
+ nodePackages.vue-language-server
nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server
phpactor