packages: Add xone
This commit is contained in:
parent
fe167fd072
commit
cf63b635ac
20 changed files with 798 additions and 813 deletions
|
|
@ -1,14 +1,14 @@
|
|||
local Util = require("lazyvim.util")
|
||||
|
||||
local function map(mode, lhs, rhs, opts)
|
||||
local keys = require("lazy.core.handler").handlers.keys
|
||||
---@cast keys LazyKeysHandler
|
||||
-- do not create the map if a lazy keys handler exists
|
||||
if not keys.active[keys.parse({ lhs, mode = mode }).id] then
|
||||
opts = opts or {}
|
||||
opts.silent = opts.silent ~= false
|
||||
vim.keymap.set(mode, lhs, rhs, opts)
|
||||
end
|
||||
local keys = require("lazy.core.handler").handlers.keys
|
||||
---@cast keys LazyKeysHandler
|
||||
-- do not create the map if a lazy keys handler exists
|
||||
if not keys.active[keys.parse({ lhs, mode = mode }).id] then
|
||||
opts = opts or {}
|
||||
opts.silent = opts.silent ~= false
|
||||
vim.keymap.set(mode, lhs, rhs, opts)
|
||||
end
|
||||
end
|
||||
local opts = { noremap = true, silent = true }
|
||||
local term_opts = { silent = true }
|
||||
|
|
@ -32,10 +32,10 @@ map("n", "<leader>do", ':lua require("dap").step_over()<CR>', { desc = "Step ove
|
|||
map("n", "<leader>di", ':lua require("dap").step_into()<CR>', { desc = "Step into" })
|
||||
map("n", "<leader>dc", ':lua require("dap").continue()<CR>', { desc = "Continue" })
|
||||
map("n", "<leader>du", function()
|
||||
require("dapui").toggle()
|
||||
require("dapui").toggle()
|
||||
end, { desc = "Toggle DAP UI" })
|
||||
map("n", "<leader>de", function()
|
||||
require("dapui").eval()
|
||||
require("dapui").eval()
|
||||
end, { desc = "DAP Eval" })
|
||||
|
||||
-- window movement
|
||||
|
|
@ -48,7 +48,7 @@ map("i", "<A-k>", [[<Cmd>wincmd j<CR>]], opts)
|
|||
|
||||
-- toggle terminal
|
||||
local lazyterm = function()
|
||||
Util.terminal(nil, { cwd = Util.root(), esc_esc = false, ctrl_hjkl = false })
|
||||
Util.terminal(nil, { cwd = Util.root(), esc_esc = false, ctrl_hjkl = false })
|
||||
end
|
||||
map("n", "<c-t>", lazyterm, { desc = "Terminal (root dir)" })
|
||||
map("t", "<c-t>", "<cmd>close<cr>", { desc = "Hide Terminal" })
|
||||
|
|
@ -65,70 +65,70 @@ map("n", "<F2>", ":BufferLineCycleNext<CR>", opts)
|
|||
|
||||
-- git
|
||||
map("n", "<leader>gq", function()
|
||||
require("telescope.builtin").git_commits()
|
||||
require("telescope.builtin").git_commits()
|
||||
end, { desc = "Commits" })
|
||||
map("n", "<leader>gw", function()
|
||||
require("telescope.builtin").git_bcommits()
|
||||
require("telescope.builtin").git_bcommits()
|
||||
end, { desc = "Commits in branch" })
|
||||
map("n", "<leader>gb", function()
|
||||
require("telescope.builtin").git_branches()
|
||||
require("telescope.builtin").git_branches()
|
||||
end, { desc = "Branches" })
|
||||
map("n", "<leader>gr", function()
|
||||
require("telescope.builtin").git_status()
|
||||
require("telescope.builtin").git_status()
|
||||
end, { desc = "Git status" })
|
||||
map("n", "<leader>ga", function()
|
||||
require("telescope.builtin").git_stash()
|
||||
require("telescope.builtin").git_stash()
|
||||
end, { desc = "Git stash" })
|
||||
map("n", "<leader>gg", function()
|
||||
Util.terminal({ "gitui" }, { cwd = Util.root() })
|
||||
Util.terminal({ "gitui" }, { cwd = Util.root() })
|
||||
end, { desc = "gitui (root dir)" })
|
||||
map("n", "<leader>gG", function()
|
||||
Util.terminal({ "gitui" })
|
||||
Util.terminal({ "gitui" })
|
||||
end, { desc = "gitui (cwd)" })
|
||||
map("n", "<leader>gB", function()
|
||||
require("gitblame")
|
||||
vim.cmd(":GitBlameToggle")
|
||||
require("gitblame")
|
||||
vim.cmd(":GitBlameToggle")
|
||||
end, { desc = "git blame" })
|
||||
|
||||
-- harpoon man
|
||||
map("n", "<leader>h1", function()
|
||||
require("harpoon.ui").nav_file(1)
|
||||
require("harpoon.ui").nav_file(1)
|
||||
end, { desc = "First Harpoon File" })
|
||||
map("n", "<leader>h2", function()
|
||||
require("harpoon.ui").nav_file(2)
|
||||
require("harpoon.ui").nav_file(2)
|
||||
end, { desc = "Second Harpoon File" })
|
||||
map("n", "<leader>h3", function()
|
||||
require("harpoon.ui").nav_file(3)
|
||||
require("harpoon.ui").nav_file(3)
|
||||
end, { desc = "First Harpoon File" })
|
||||
map("n", "<leader>ha", function()
|
||||
require("harpoon.mark").add_file()
|
||||
require("harpoon.mark").add_file()
|
||||
end, { desc = "First Harpoon File" })
|
||||
map("n", "<leader>hd", function()
|
||||
require("harpoon.mark").remove_file()
|
||||
require("harpoon.mark").remove_file()
|
||||
end, { desc = "First Harpoon File" })
|
||||
map("n", "<leader>hm", ":Telescope harpoon marks<CR>", { noremap = true, silent = true, desc = "Show harpoon marks" })
|
||||
|
||||
-- telescope
|
||||
map("n", "<leader>fb", function()
|
||||
require("telescope").extensions.file_browser.file_browser({})
|
||||
require("telescope").extensions.file_browser.file_browser({})
|
||||
end, { desc = "File Browser" })
|
||||
map("n", "<leader>ff", function()
|
||||
require("telescope.builtin").find_files()
|
||||
require("telescope.builtin").find_files()
|
||||
end, { desc = "Find Files" })
|
||||
map("n", "<leader>fg", function()
|
||||
Live_grep_from_project_git_root()
|
||||
Live_grep_from_project_git_root()
|
||||
end, { desc = "Live Grep (root)" })
|
||||
map("n", "<leader>fG", function()
|
||||
require("telescope.builtin").live_grep()
|
||||
require("telescope.builtin").live_grep()
|
||||
end, { desc = "Live Grep (cwd)" })
|
||||
map("n", "<leader>fh", function()
|
||||
require("telescope.builtin").help_tags()
|
||||
require("telescope.builtin").help_tags()
|
||||
end, { desc = "Help" })
|
||||
map("n", "<leader>fp", function()
|
||||
require("telescope").extensions.project.project({})
|
||||
require("telescope").extensions.project.project({})
|
||||
end, { noremap = true, silent = true, desc = "Projects" })
|
||||
map("n", "<leader>z", function()
|
||||
require("telescope").extensions.zoxide.list({})
|
||||
require("telescope").extensions.zoxide.list({})
|
||||
end, { desc = "Zoxide" })
|
||||
|
||||
-- neoscroll
|
||||
|
|
@ -142,13 +142,13 @@ map("n", "<leader>t", "<cmd>TroubleToggle<CR>", term_opts)
|
|||
|
||||
-- format
|
||||
map({ "n", "v" }, "<F4>", function()
|
||||
Util.format({ force = true })
|
||||
Util.format({ force = true })
|
||||
end, { desc = "Format" })
|
||||
|
||||
-- better yank
|
||||
function Better_yank(opts)
|
||||
local current_line = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "y")
|
||||
local current_line = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "y")
|
||||
end
|
||||
|
||||
vim.api.nvim_create_user_command("BetterYank", Better_yank, { count = 1 })
|
||||
|
|
@ -156,8 +156,8 @@ map("n", "by", ":BetterYank<CR>", term_opts)
|
|||
|
||||
-- better delete
|
||||
function Better_delete(opts)
|
||||
local current_line = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "d")
|
||||
local current_line = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "d")
|
||||
end
|
||||
|
||||
vim.api.nvim_create_user_command("BetterDelete", Better_delete, { count = 1 })
|
||||
|
|
@ -165,13 +165,13 @@ map("n", "bd", ":BetterDelete<CR>", term_opts)
|
|||
|
||||
-- neovide zoom
|
||||
local change_scale_factor = function(delta)
|
||||
vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
|
||||
vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
|
||||
end
|
||||
vim.keymap.set("n", "<C-=>", function()
|
||||
change_scale_factor(1.25)
|
||||
change_scale_factor(1.25)
|
||||
end)
|
||||
vim.keymap.set("n", "<C-->", function()
|
||||
change_scale_factor(1 / 1.25)
|
||||
change_scale_factor(1 / 1.25)
|
||||
end)
|
||||
|
||||
-- neovide paste
|
||||
|
|
@ -179,23 +179,24 @@ vim.g.neovide_input_use_logo = 1
|
|||
vim.api.nvim_set_keymap("i", "<C-S-V>", "<ESC>p<CR>I", { noremap = true, silent = true })
|
||||
|
||||
function Get_git_root()
|
||||
local opts = {}
|
||||
local function is_git_repo()
|
||||
vim.fn.system("git rev-parse --is-inside-work-tree")
|
||||
local opts = {}
|
||||
local function is_git_repo()
|
||||
vim.fn.system("git rev-parse --is-inside-work-tree")
|
||||
|
||||
return vim.v.shell_error == 0
|
||||
end
|
||||
if is_git_repo() then
|
||||
local dot_git_path = vim.fn.finddir(".git", ".;")
|
||||
local root = vim.fn.fnamemodify(dot_git_path, ":h")
|
||||
opts = {
|
||||
cwd = root,
|
||||
}
|
||||
end
|
||||
return opts
|
||||
return vim.v.shell_error == 0
|
||||
end
|
||||
if is_git_repo() then
|
||||
local dot_git_path = vim.fn.finddir(".git", ".;")
|
||||
local root = vim.fn.fnamemodify(dot_git_path, ":h")
|
||||
opts = {
|
||||
cwd = root,
|
||||
}
|
||||
end
|
||||
return opts
|
||||
end
|
||||
|
||||
function Live_grep_from_project_git_root()
|
||||
local opts = Get_git_root()
|
||||
require("telescope.builtin").live_grep(opts)
|
||||
local opts = Get_git_root()
|
||||
require("telescope.builtin").live_grep(opts)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue