mirror of
https://github.com/ksyasuda/dotfiles.git
synced 2025-12-05 02:53:38 -08:00
update nvim
This commit is contained in:
@@ -9,8 +9,3 @@ require("utils.telescope_extra").setup()
|
|||||||
require("utils.functions.git_paste").setup({ telescope_key = "<leader>pg" })
|
require("utils.functions.git_paste").setup({ telescope_key = "<leader>pg" })
|
||||||
require("utils.treesitter.parsers.hyprlang")
|
require("utils.treesitter.parsers.hyprlang")
|
||||||
require("utils.hyprland.lsp")
|
require("utils.hyprland.lsp")
|
||||||
-- vim.notify = function(msg, level, opts)
|
|
||||||
-- print("Notification debug:", msg, level, vim.inspect(opts))
|
|
||||||
-- -- Call original notify
|
|
||||||
-- require("notify")(msg, level, opts)
|
|
||||||
-- end
|
|
||||||
|
|||||||
64
.config/nvim/lazy-lock.json
Normal file
64
.config/nvim/lazy-lock.json
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
{
|
||||||
|
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
||||||
|
"any-jump.vim": { "branch": "master", "commit": "f95674d9a4251ac02f452d5f1861e4422f4652c7" },
|
||||||
|
"better-diagnostic-virtual-text": { "branch": "main", "commit": "eb3a77e714aa6c295bdb4f074fccbda637090f6e" },
|
||||||
|
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||||
|
"catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" },
|
||||||
|
"cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" },
|
||||||
|
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||||
|
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||||
|
"cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
|
||||||
|
"cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
|
||||||
|
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
|
||||||
|
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||||
|
"codecompanion.nvim": { "branch": "main", "commit": "946e18627271e008635d53f96a56af459ebb40da" },
|
||||||
|
"conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
|
||||||
|
"copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
|
||||||
|
"copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" },
|
||||||
|
"copilot.lua": { "branch": "master", "commit": "30b98a4c25d6152c14084020f703b6d56e1f1122" },
|
||||||
|
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||||
|
"fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
|
||||||
|
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||||
|
"gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
|
||||||
|
"goto-preview": { "branch": "main", "commit": "cf561d10b4b104db20375c48b86cf36af9f96e00" },
|
||||||
|
"image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
|
||||||
|
"img-clip.nvim": { "branch": "main", "commit": "f33f3af9ba50f99d70f8fcb1a8575750ada4ea4a" },
|
||||||
|
"lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
|
||||||
|
"lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
|
||||||
|
"lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
|
||||||
|
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
|
||||||
|
"mcphub.nvim": { "branch": "main", "commit": "8ff40b5edc649959bb7e89d25ae18e055554859a" },
|
||||||
|
"mini.diff": { "branch": "main", "commit": "a2df2a9a485328c20252b7cadb11feb717020e45" },
|
||||||
|
"mini.nvim": { "branch": "main", "commit": "ef89bb115244297ed440441faa61759ddcf4a970" },
|
||||||
|
"noice.nvim": { "branch": "main", "commit": "38c702be0d8fea81527ee6a73e1e834e72481193" },
|
||||||
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
|
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
|
||||||
|
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||||
|
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||||
|
"nvim-html-css": { "branch": "main", "commit": "41ceceb30175de850e4caa4d709205baa083a8eb" },
|
||||||
|
"nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
|
||||||
|
"nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" },
|
||||||
|
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||||
|
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
|
||||||
|
"nvim-tree.lua": { "branch": "master", "commit": "321bc61580fd066b76861c32de3319c3a6d089e7" },
|
||||||
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
|
"nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
|
||||||
|
"nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
|
||||||
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
|
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||||
|
"rainbow-delimiters.nvim": { "branch": "master", "commit": "3277ad5f96eb03c9d618c88e24f683e4364e578c" },
|
||||||
|
"render-markdown.nvim": { "branch": "main", "commit": "2064980580af7f00385859b6344c6a4737383257" },
|
||||||
|
"snacks.nvim": { "branch": "main", "commit": "dae80fb393f712bd7352a20f9185f5e16b69f20f" },
|
||||||
|
"telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" },
|
||||||
|
"telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" },
|
||||||
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||||
|
"telescope-glyph.nvim": { "branch": "master", "commit": "f63f01e129e71cc25b79637610674bbf0be5ce9d" },
|
||||||
|
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||||
|
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||||
|
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||||
|
"vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
|
||||||
|
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
|
||||||
|
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||||
|
"vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" },
|
||||||
|
"which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
|
||||||
|
}
|
||||||
@@ -221,6 +221,55 @@ return {
|
|||||||
diff = {
|
diff = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
provider = "mini_diff",
|
provider = "mini_diff",
|
||||||
|
provider_opts = {
|
||||||
|
-- Options for inline diff provider
|
||||||
|
inline = {
|
||||||
|
layout = "buffer", -- float|buffer - Where to display the diff
|
||||||
|
|
||||||
|
diff_signs = {
|
||||||
|
signs = {
|
||||||
|
text = "▌", -- Sign text for normal changes
|
||||||
|
reject = "✗", -- Sign text for rejected changes in super_diff
|
||||||
|
highlight_groups = {
|
||||||
|
addition = "DiagnosticOk",
|
||||||
|
deletion = "DiagnosticError",
|
||||||
|
modification = "DiagnosticWarn",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- Super Diff options
|
||||||
|
icons = {
|
||||||
|
accepted = " ",
|
||||||
|
rejected = " ",
|
||||||
|
},
|
||||||
|
colors = {
|
||||||
|
accepted = "DiagnosticOk",
|
||||||
|
rejected = "DiagnosticError",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
opts = {
|
||||||
|
context_lines = 3, -- Number of context lines in hunks
|
||||||
|
dim = 25, -- Background dim level for floating diff (0-100, [100 full transparent], only applies when layout = "float")
|
||||||
|
full_width_removed = true, -- Make removed lines span full width
|
||||||
|
show_keymap_hints = true, -- Show "gda: accept | gdr: reject" hints above diff
|
||||||
|
show_removed = true, -- Show removed lines as virtual text
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- Options for the split provider
|
||||||
|
split = {
|
||||||
|
close_chat_at = 240, -- Close an open chat buffer if the total columns of your display are less than...
|
||||||
|
layout = "vertical", -- vertical|horizontal split
|
||||||
|
opts = {
|
||||||
|
"internal",
|
||||||
|
"filler",
|
||||||
|
"closeoff",
|
||||||
|
"algorithm:histogram", -- https://adamj.eu/tech/2024/01/18/git-improve-diff-histogram/
|
||||||
|
"indent-heuristic", -- https://blog.k-nut.eu/better-git-diffs
|
||||||
|
"followwrap",
|
||||||
|
"linematch:120",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
---Customize how tokens are displayed
|
---Customize how tokens are displayed
|
||||||
---@param tokens number
|
---@param tokens number
|
||||||
|
|||||||
@@ -36,15 +36,14 @@ return {
|
|||||||
dynamic_preview_title = true,
|
dynamic_preview_title = true,
|
||||||
treesitter = true,
|
treesitter = true,
|
||||||
},
|
},
|
||||||
mappings = {
|
-- mappings = {
|
||||||
i = {
|
-- i = {
|
||||||
-- map actions.which_key to <C-h> (default: <C-/>)
|
-- -- map actions.which_key to <C-h> (default: <C-/>)
|
||||||
-- actions.which_key shows the mappings for your picker,
|
-- -- actions.which_key shows the mappings for your picker,
|
||||||
-- e.g. git_{create, delete, ...}_branch for the git_branches picker
|
-- -- e.g. git_{create, delete, ...}_branch for the git_branches picker
|
||||||
["<C-h>"] = "which_key",
|
-- ["<C-/>"] = "which_key",
|
||||||
["<C-u"] = false,
|
-- },
|
||||||
},
|
-- },
|
||||||
},
|
|
||||||
file_ignore_patterns = { "^node_modules/", "^env/", "^__pycache__/" },
|
file_ignore_patterns = { "^node_modules/", "^env/", "^__pycache__/" },
|
||||||
},
|
},
|
||||||
pickers = {
|
pickers = {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
local telescope = require("telescope")
|
local telescope = require("telescope")
|
||||||
local telescopeConfig = require("telescope.config")
|
local telescopeConfig = require("telescope.config")
|
||||||
|
local actions = require("telescope.actions")
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
@@ -36,56 +37,13 @@ function M.setup()
|
|||||||
-- I don't want to search in the `.git` directory.
|
-- I don't want to search in the `.git` directory.
|
||||||
table.insert(vimgrep_arguments, "--glob")
|
table.insert(vimgrep_arguments, "--glob")
|
||||||
table.insert(vimgrep_arguments, "!**/.git/*")
|
table.insert(vimgrep_arguments, "!**/.git/*")
|
||||||
telescope.setup({
|
vim.tbl_deep_extend("force", telescopeConfig.values, {
|
||||||
defaults = {
|
|
||||||
-- `hidden = true` is not supported in text grep commands.
|
|
||||||
vimgrep_arguments = vimgrep_arguments,
|
|
||||||
},
|
|
||||||
pickers = {
|
|
||||||
find_files = {
|
|
||||||
-- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d.
|
|
||||||
find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" },
|
|
||||||
mappings = {
|
mappings = {
|
||||||
n = {
|
i = {
|
||||||
["cd"] = function(prompt_bufnr)
|
["<C-h>"] = actions.results_scrolling_left,
|
||||||
local selection = require("telescope.actions.state").get_selected_entry()
|
["<C-l>"] = actions.results_scrolling_right,
|
||||||
local dir = vim.fn.fnamemodify(selection.path, ":p:h")
|
|
||||||
require("telescope.actions").close(prompt_bufnr)
|
|
||||||
-- Depending on what you want put `cd`, `lcd`, `tcd`
|
|
||||||
vim.cmd(string.format("silent lcd %s", dir))
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
|
||||||
},
|
|
||||||
preview = {
|
|
||||||
-- show images in telescope using kitty
|
|
||||||
mime_hook = function(filepath, bufnr, opts)
|
|
||||||
local is_image = function(filepath)
|
|
||||||
local image_extensions = { "png", "jpg" } -- Supported image formats
|
|
||||||
local split_path = vim.split(filepath:lower(), ".", { plain = true })
|
|
||||||
local extension = split_path[#split_path]
|
|
||||||
return vim.tbl_contains(image_extensions, extension)
|
|
||||||
end
|
|
||||||
if is_image(filepath) then
|
|
||||||
local term = vim.api.nvim_open_term(bufnr, {})
|
|
||||||
local function send_output(_, data, _)
|
|
||||||
for _, d in ipairs(data) do
|
|
||||||
vim.api.nvim_chan_send(term, d .. "\r\n")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
vim.fn.jobstart({
|
|
||||||
"kitty +icat " .. filepath, -- Terminal image viewer command
|
|
||||||
}, { on_stdout = send_output, stdout_buffered = true, pty = true })
|
|
||||||
else
|
|
||||||
require("telescope.previewers.utils").set_preview_message(
|
|
||||||
bufnr,
|
|
||||||
opts.winid,
|
|
||||||
"Binary cannot be previewed"
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user