js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 08:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(nvim): Change picker to FzfLua

Browse source
This commit is contained in:
js0ny 2025-04-08 18:30:49 +01:00
parent e0ca95b7a4
commit c25d4ec182
10 changed files with 128 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

80
tools/nvim/lua/plugins/appearance.lua
View file

@ -32,9 +32,9 @@ return {
opts = { opts = {
variant = "dawn", variant = "dawn",
}, },
cmd = "Telescope colorscheme", cmd = "FzfLua colorschemes",
}, },
{ "rebelot/kanagawa.nvim", cmd = "Telescope colorscheme" }, { "rebelot/kanagawa.nvim", cmd = "FzfLua colorschemes" },
{ -- Modern Status Line { -- Modern Status Line
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
@ -43,37 +43,37 @@ return {
require("plugins.mod.lualine") require("plugins.mod.lualine")
end, end,
}, },
{ -- Breadcrumb -- { -- Breadcrumb
"Bekaboo/dropbar.nvim", -- "Bekaboo/dropbar.nvim",
dependencies = { -- dependencies = {
"nvim-telescope/telescope-fzf-native.nvim", -- "nvim-telescope/telescope-fzf-native.nvim",
build = "make", -- build = "make",
}, -- },
opts = {}, -- opts = {},
keys = { -- keys = {
{ -- {
"<Leader>+", -- "<Leader>+",
function() -- function()
require("dropbar.api").pick() -- require("dropbar.api").pick()
end, -- end,
desc = "Pick symbols in winbar", -- desc = "Pick symbols in winbar",
}, -- },
{ -- {
"[;", -- "[;",
function() -- function()
require("dropbar.api").goto_context_start() -- require("dropbar.api").goto_context_start()
end, -- end,
desc = "Go to start of current context", -- desc = "Go to start of current context",
}, -- },
{ -- {
"];", -- "];",
function() -- function()
require("dropbar.api").select_next_context() -- require("dropbar.api").select_next_context()
end, -- end,
desc = "Select next context", -- desc = "Select next context",
}, -- },
}, -- },
}, -- },
{ import = "plugins.mod.bufferline" }, -- Buffer Top Bar { import = "plugins.mod.bufferline" }, -- Buffer Top Bar
{ -- Git Blames, Changes { -- Git Blames, Changes
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
@ -87,11 +87,11 @@ return {
{ "<leader>gB", "<cmd>Gitsigns toggle_current_line_blame<CR>", desc = "Toggle line blame" }, { "<leader>gB", "<cmd>Gitsigns toggle_current_line_blame<CR>", desc = "Toggle line blame" },
}, },
}, },
{ -- Highlight and navigate between TODOs -- { -- Highlight and navigate between TODOs
"folke/todo-comments.nvim", -- "folke/todo-comments.nvim",
cmd = { "TodoTelescope" }, -- cmd = { "TodoTelescope" },
event = "BufRead", -- event = "BufRead",
opts = {}, -- opts = {},
dependencies = { "nvim-lua/plenary.nvim" }, -- dependencies = { "nvim-lua/plenary.nvim" },
}, -- },
} }

34
tools/nvim/lua/plugins/fileutils.lua
View file

@ -11,23 +11,23 @@ return {
}, },
}, },
-- { import = "plugins.mod.nvim-tree" }, -- { import = "plugins.mod.nvim-tree" },
{ import = "plugins.mod.telescope" }, -- { import = "plugins.mod.telescope" },
-- { import = "plugins.mod.fzf" }, { import = "plugins.mod.fzf" },
{ -- {
"ahmedkhalf/project.nvim", -- "ahmedkhalf/project.nvim",
event = "VeryLazy", -- event = "VeryLazy",
opts = { -- opts = {
detection_methods = { "lsp", "pattern" }, -- detection_methods = { "lsp", "pattern" },
patterns = { ".git", "Makefile", "package.json" }, -- patterns = { ".git", "Makefile", "package.json" },
sync_root_with_cwd = true, -- sync_root_with_cwd = true,
silent_chdir = true, -- silent_chdir = true,
scope_chdir = "global", -- scope_chdir = "global",
}, -- },
config = function() -- config = function()
require("telescope").load_extension("projects") -- require("telescope").load_extension("projects")
end, -- end,
dependencies = { "nvim-telescope/telescope.nvim" }, -- dependencies = { "nvim-telescope/telescope.nvim" },
}, -- },
-- { -- {
-- "NeogitOrg/neogit", -- "NeogitOrg/neogit",
-- config = true, -- config = true,

22
tools/nvim/lua/plugins/lang/markdown/obsidian-nvim.lua
View file

@ -1,5 +1,5 @@
return { return {
"epwalsh/obsidian.nvim", "obsidian-nvim/obsidian.nvim",
version = "*", -- recommended, use latest release instead of latest commit version = "*", -- recommended, use latest release instead of latest commit
-- lazy = false, -- lazy = false,
ft = "markdown", ft = "markdown",
@ -38,11 +38,15 @@ return {
-- "BufReadPre path/to/my-vault/*.md", -- "BufReadPre path/to/my-vault/*.md",
-- "BufNewFile path/to/my-vault/*.md", -- "BufNewFile path/to/my-vault/*.md",
-- }, -- },
keys = {
{ "<leader>fo", "<cmd>ObsidianQuickSwitch<CR>", desc = "Obsidian: Quick Switch" },
},
dependencies = { dependencies = {
-- Required. -- Required.
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
-- see below for full list of optional dependencies 👇 -- see below for full list of optional dependencies 👇
"ibhagwan/fzf-lua",
}, },
opts = { opts = {
workspaces = { workspaces = {
@ -53,11 +57,18 @@ return {
}, },
completion = { completion = {
nvim_cmp = false, nvim_cmp = false,
blink = true,
min_chars = 2, min_chars = 2,
}, },
ui = { ui = {
enable = false, enable = false,
}, },
daily_notes = {
folder = "_Global/Periodic",
date_format = "%Y-%m-%d",
default_tags = { "daily" },
template = nil,
},
-- see below for full list of options 👇 -- see below for full list of options 👇
attachments = { attachments = {
img_folder = "_Global/Assets", img_folder = "_Global/Assets",
@ -65,5 +76,14 @@ return {
return string.format("%s-", os.time()) return string.format("%s-", os.time())
end, end,
}, },
mappings = {
["<cr>"] = {
action = function()
require("obsidian").util.smart_action()
end,
opts = { buffer = true, expr = true },
},
},
new_notes_location = "current_dir",
}, },
} }

12
tools/nvim/lua/plugins/lang/org.lua
View file

@ -2,8 +2,8 @@ return {
{ {
"nvim-orgmode/orgmode", "nvim-orgmode/orgmode",
dependencies = { dependencies = {
"nvim-telescope/telescope.nvim", -- "nvim-telescope/telescope.nvim",
"nvim-orgmode/telescope-orgmode.nvim", -- "nvim-orgmode/telescope-orgmode.nvim",
"nvim-orgmode/org-bullets.nvim", "nvim-orgmode/org-bullets.nvim",
"Saghen/blink.cmp", "Saghen/blink.cmp",
}, },
@ -65,11 +65,11 @@ return {
}, },
}) })
require("telescope").setup() -- require("telescope").setup()
require("telescope").load_extension("orgmode") -- require("telescope").load_extension("orgmode")
-- vim.keymap.set("n", "<leader>r", require("telescope").extensions.orgmode.refile_heading) -- vim.keymap.set("n", "<leader>r", require("telescope").extensions.orgmode.refile_heading)
vim.keymap.set("n", "<leader>oP", require("telescope").extensions.orgmode.search_headings) -- vim.keymap.set("n", "<leader>oP", require("telescope").extensions.orgmode.search_headings)
vim.keymap.set("n", "<leader>op", "<cmd>Telescope find_files cwd=~/OrgFiles<CR>") vim.keymap.set("n", "<leader>op", "<cmd>FzfLua files cwd=~/OrgFiles<CR>")
-- vim.keymap.set("n", "<leader>li", require("telescope").extensions.orgmode.insert_link) -- vim.keymap.set("n", "<leader>li", require("telescope").extensions.orgmode.insert_link)
end, end,
}, },

2
tools/nvim/lua/plugins/lazy-nvim.lua
View file

@ -19,4 +19,4 @@ vim.opt.rtp:prepend(lazypath)
-- loading lazy.nvim so that mappings are correct. -- loading lazy.nvim so that mappings are correct.
-- This is also a good place to setup other settings (vim.opt) -- This is also a good place to setup other settings (vim.opt)
vim.g.mapleader = " " vim.g.mapleader = " "
vim.g.maplocalleader = "<C-k>" vim.g.maplocalleader = "\\"

3
tools/nvim/lua/plugins/misc.lua
View file

@ -14,7 +14,8 @@ return {
lazy = true, lazy = true,
-- event = "VeryLazy", -- event = "VeryLazy",
dependencies = { dependencies = {
"nvim-telescope/telescope.nvim", -- "nvim-telescope/telescope.nvim",
"ibhagwan/fzf-lua",
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
}, },

5
tools/nvim/lua/plugins/mod/avante-nvim.lua
View file

@ -8,7 +8,7 @@ return {
-- for example -- for example
provider = "openai", provider = "openai",
openai = { openai = {
endpoint = "https://yunwu.ai/v1", endpoint = "https://aihubmix.com/v1",
model = "claude-3-7-sonnet-20250219", -- your desired model (or use gpt-4o, etc.) model = "claude-3-7-sonnet-20250219", -- your desired model (or use gpt-4o, etc.)
timeout = 30000, -- timeout in milliseconds timeout = 30000, -- timeout in milliseconds
temperature = 0, -- adjust if needed temperature = 0, -- adjust if needed
@ -25,7 +25,8 @@ return {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
--- The below dependencies are optional, --- The below dependencies are optional,
"nvim-telescope/telescope.nvim", -- for file_selector provider telescope -- "nvim-telescope/telescope.nvim", -- for file_selector provider telescope
"ibhagwan/fzf-lua",
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
"zbirenbaum/copilot.lua", -- for providers='copilot' "zbirenbaum/copilot.lua", -- for providers='copilot'

24
tools/nvim/lua/plugins/mod/fzf.lua
View file

@ -2,5 +2,29 @@ return {
"ibhagwan/fzf-lua", "ibhagwan/fzf-lua",
-- optional for icon support -- optional for icon support
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
cmd = "FzfLua",
keys = {
{ "<leader><leader>", "<cmd>FzfLua files<CR>", desc = "Find Files" },
{ "<leader>fc", "<cmd>FzfLua files cwd=~/.config/nvim<CR>", desc = "Edit configs" },
{ "<leader>/", "<cmd>FzfLua live_grep<CR>", desc = "Grep Files" },
{ "<leader>;", "<cmd>FzfLua<CR>", desc = "Show Telescope Commands" },
{ "<leader>ui", "<cmd>FzfLua colorschemes<CR>", desc = "Change colorscheme" },
-- find_files { "<leader>pp", "<cmd>FzfLua projects<CR>", desc = "Listfind_files all Projects" },
{ "<leader>pd", "<cmd>FzfLua zoxide<CR>", desc = "List recent directories" },
-- { "<leader>pg", "<cmd>FzfLua projects<CR>", desc = "List all Git Projects" },
{ "<leader>ps", "<cmd>FzfLua session-lens<CR>", desc = "List all sessions" },
{ "<leader>gs", "<cmd>FzfLua git_status<CR>", desc = "Git Status" },
{ "<leader>gt", "<cmd>FzfLua git_branches<CR>", desc = "Git Branches" },
{ "<leader>gc", "<cmd>FzfLua git_commits<CR>", desc = "Show commits" },
{ "<leader>fb", "<cmd>FzfLua buffers<CR>", desc = "List Buffers" },
{ "<leader>ff", "<cmd>FzfLua fd<CR>", desc = "Find Files" },
{ "<leader>fh", "<cmd>FzfLua oldfiles<CR>", desc = "Recent Files" },
{ "<leader>ce", "<cmd>FzfLua diagnostics<CR>", desc = "Navigate errors/warnings" },
{ "<leader>cs", "<cmd>FzfLua treesitter<CR>", desc = "Search symbols" },
{ "<leader>cS", "<cmd>FzfLua grep_string<CR>", desc = "Search current symbol" },
{ "<leader>bB", "<cmd>FzfLua buffers<CR>", desc = "List Buffers" },
{ "<leader>fl", ":FzfLua filetypes", desc = "Set Filetype/Lang to ..." },
{ "<leader>R", "<cmd>FzfLua resume<CR>", desc = "Resume FzfLua" },
},
opts = {}, opts = {},
} }

6
tools/nvim/lua/plugins/mod/snacks-nvim.lua
View file

@ -11,14 +11,14 @@ return {
enabled = true, enabled = true,
preset = { preset = {
keys = { keys = {
{ key = "p", icon = "󰈞 ", desc = "查找项目", action = "<cmd>Telescope projects<CR>" }, -- { key = "p", icon = "󰈞 ", desc = "查找项目", action = "<cmd>Telescope projects<CR>" },
{ key = "h", icon = "", desc = "历史文件", action = "<cmd>Telescope oldfiles<CR>" }, { key = "h", icon = "", desc = "历史文件", action = "<cmd>FzfLua oldfiles<CR>" },
{ key = "l", icon = "", desc = "加载会话", action = "<cmd>SessionSearch<CR>" }, { key = "l", icon = "", desc = "加载会话", action = "<cmd>SessionSearch<CR>" },
{ {
key = "c", key = "c",
icon = "", icon = "",
desc = "转到设置", desc = "转到设置",
action = "<cmd>Telescope find_files cwd=~/.config/nvim<CR>", action = "<cmd>FzfLua files cwd=~/.config/nvim<CR>",
}, },
{ key = "q", icon = "󱊷 ", desc = "退出", action = "<cmd>qa<CR>" }, { key = "q", icon = "󱊷 ", desc = "退出", action = "<cmd>qa<CR>" },
}, },

2
tools/nvim/lua/plugins/mod/telescope.lua
View file

@ -33,7 +33,7 @@ return {
{ "<leader>fc", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>", desc = "Edit configs" }, { "<leader>fc", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>", desc = "Edit configs" },
{ "<leader>/", "<cmd>Telescope live_grep<CR>", desc = "Grep Files" }, { "<leader>/", "<cmd>Telescope live_grep<CR>", desc = "Grep Files" },
{ "<leader>;", "<cmd>Telescope<CR>", desc = "Show Telescope Commands" }, { "<leader>;", "<cmd>Telescope<CR>", desc = "Show Telescope Commands" },
{ "<leader>ui", "<cmd>Telescope colorscheme<CR>", desc = "Change colorscheme" }, { "<leader>ui", "<cmd>FzfLua colorscheme<CR>", desc = "Change colorscheme" },
{ "<leader>pp", "<cmd>Telescope projects<CR>", desc = "List all Projects" }, { "<leader>pp", "<cmd>Telescope projects<CR>", desc = "List all Projects" },
{ "<leader>pg", "<cmd>Telescope projects<CR>", desc = "List all Git Projects" }, { "<leader>pg", "<cmd>Telescope projects<CR>", desc = "List all Git Projects" },
{ "<leader>ps", "<cmd>Telescope session-lens<CR>", desc = "List all sessions" }, { "<leader>ps", "<cmd>Telescope session-lens<CR>", desc = "List all sessions" },