fix: nvim
This commit is contained in:
@@ -101,7 +101,7 @@ keymap.set('n', "<Leader>sb", "<cmd>Telescope git_branches<cr>", {desc= "Checkou
|
||||
keymap.set('n', "<Leader>sc", "<cmd>:nohl<cr>", {desc= "no highlight" })
|
||||
keymap.set('n', "<Leader>sd", "<cmd>Telescope lsp_document_diagnostics<cr>", {desc= "Document Diagnostics" })
|
||||
keymap.set('n', "<Leader>sD", "<cmd>Telescope lsp_workspace_diagnostics<cr>", {desc= "Workspace Diagnostics" })
|
||||
keymap.set('n', "<Leader>sf", "<cmd>Telescope find_files<CR><cr>", {desc= "Find File" })
|
||||
keymap.set('n', "<Leader>sf", "<cmd>Telescope find_files<cr>", {desc= "Find File" })
|
||||
keymap.set('n', "<Leader>sr", function() require("telescope.builtin").oldfiles({ cwd = vim.loop.cwd() }) end, {desc= "Old File" })
|
||||
keymap.set('n', "<Leader>sm", "<cmd>Telescope marks<cr>", {desc= "Marks" })
|
||||
keymap.set('n', "<Leader>sM", "<cmd>Telescope man_pages<cr>", {desc= "Man Pages" })
|
||||
@@ -130,7 +130,9 @@ keymap.set('n', "<Leader>zz", "<cmd>TZAtaraxis<cr>", {desc= "toggle zen" })
|
||||
keymap.set('n', '<Leader>;', ':Dashboard<CR>', { noremap = true, silent = true })
|
||||
|
||||
-- Ctrl
|
||||
keymap.set('n', '<C-p>', ":Telescope find_files<CR>", { noremap = true, silent = true })
|
||||
keymap.set('n', '<C-p>', function()
|
||||
require("telescope.builtin").find_files()
|
||||
end, { noremap = true, silent = true, desc = "Find Files" })
|
||||
-- better window movement
|
||||
keymap.set('n', '<C-h>', '<C-w>h', { silent = true })
|
||||
keymap.set('n', '<C-j>', '<C-w>j', { silent = true })
|
||||
@@ -144,6 +146,11 @@ keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', { silent = true })
|
||||
|
||||
keymap.set('n', '<C-q>', ':call QuickFixToggle()<CR>', { noremap = true, silent = true })
|
||||
|
||||
-- Override two spaces (LazyVim default fzf) with Telescope live_grep
|
||||
-- Search for keywords in file contents
|
||||
keymap.set('n', ' ', function()
|
||||
require("telescope.builtin").live_grep()
|
||||
end, { noremap = true, silent = true, desc = "Search in Files (two spaces)" })
|
||||
|
||||
-- Other
|
||||
-- better edit
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
return {
|
||||
{
|
||||
"ibhagwan/fzf-lua",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
keys = {
|
||||
-- 如果需要使用 fzf-lua 的快捷键,可以在这里添加
|
||||
},
|
||||
config = function()
|
||||
require("fzf-lua").setup({
|
||||
-- fzf-lua 的配置
|
||||
winopts = {
|
||||
height = 0.85,
|
||||
width = 0.80,
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -9,10 +9,11 @@ return {
|
||||
--"bashls",
|
||||
"shfmt",
|
||||
--"tailwindcss",
|
||||
--"tsserver",
|
||||
"tsserver", -- TypeScript/JavaScript LSP
|
||||
"pylyzer",
|
||||
--"cssls",
|
||||
"bufls", -- Protocol Buffers LSP
|
||||
"gopls", -- Go LSP
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
@@ -5,6 +5,10 @@ return {
|
||||
{
|
||||
"nvim-telescope/telescope-fzf-native.nvim",
|
||||
build = "make",
|
||||
-- 确保编译成功,如果 make 失败,尝试 cmake
|
||||
cond = function()
|
||||
return vim.fn.executable("make") == 1 or vim.fn.executable("cmake") == 1
|
||||
end,
|
||||
},
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
},
|
||||
@@ -125,6 +129,15 @@ return {
|
||||
layout_config = { prompt_position = "top" },
|
||||
sorting_strategy = "ascending",
|
||||
winblend = 0,
|
||||
-- 确保文件查找器正常工作
|
||||
file_ignore_patterns = {
|
||||
"^.git/",
|
||||
"^node_modules/",
|
||||
"^.DS_Store",
|
||||
},
|
||||
-- 使用 fzf 排序(如果可用)
|
||||
path_display = { "truncate" },
|
||||
dynamic_preview_title = true,
|
||||
mappings = {
|
||||
i = {
|
||||
["<C-c>"] = actions.close,
|
||||
@@ -151,6 +164,22 @@ return {
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
-- Configure live_grep: use ripgrep if available, otherwise fallback to grep
|
||||
-- Note: Install ripgrep for better performance: brew install ripgrep
|
||||
if vim.fn.executable("rg") == 0 then
|
||||
vim.notify("ripgrep (rg) not found. live_grep will use grep (slower). Install with: brew install ripgrep", vim.log.levels.WARN)
|
||||
opts.defaults = opts.defaults or {}
|
||||
opts.defaults.vimgrep_arguments = {
|
||||
"grep",
|
||||
"--recursive",
|
||||
"--no-heading",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case",
|
||||
}
|
||||
end
|
||||
opts.extensions = vim.tbl_deep_extend("force", opts.extensions or {}, {
|
||||
file_browser = {
|
||||
theme = "dropdown",
|
||||
@@ -182,8 +211,14 @@ return {
|
||||
},
|
||||
})
|
||||
telescope.setup(opts)
|
||||
|
||||
-- 安全地加载扩展
|
||||
pcall(function()
|
||||
require("telescope").load_extension("fzf")
|
||||
end)
|
||||
pcall(function()
|
||||
require("telescope").load_extension("file_browser")
|
||||
end)
|
||||
end,
|
||||
},
|
||||
}
|
||||
Reference in New Issue
Block a user