update nvim config and junk
parent
06382cf0a1
commit
e272951042
@ -0,0 +1,21 @@
|
|||||||
|
vim.keymap.set("n", "<leader>gs", ":G<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gh", ":diffget //3<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gu", ":diffget //2<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gc", ":GCheckout<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>ga", ":G add %:p<CR><CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gc", ":G commit -v -q<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gt", ":G commit -v -q %:p<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gff", ":G ff<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gfo", ":G fetch origin<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gd", ":Gdiff<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>ge", ":Gedit<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gr", ":Gread<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>grb", ":G rebase -i<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gw", ":Gwrite<CR><CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gl", ":silent! Glog<CR>:bot copen<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gp", ":Ggrep<Space>")
|
||||||
|
vim.keymap.set("n", "<leader>gm", ":Gmove<Space>")
|
||||||
|
vim.keymap.set("n", "<leader>gbl", ":G blame<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>go", ":G checkout<Space>")
|
||||||
|
vim.keymap.set("n", "<leader>gps", ":Dispatch! git push<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>gpl", ":Dispatch! git pull<CR>")
|
@ -0,0 +1,22 @@
|
|||||||
|
local Worktree = require("git-worktree")
|
||||||
|
|
||||||
|
-- op = Operations.Switch, Operations.Create, Operations.Delete
|
||||||
|
-- metadata = table of useful values (structure dependent on op)
|
||||||
|
-- Switch
|
||||||
|
-- path = path you switched to
|
||||||
|
-- prev_path = previous worktree path
|
||||||
|
-- Create
|
||||||
|
-- path = path where worktree created
|
||||||
|
-- branch = branch name
|
||||||
|
-- upstream = upstream remote name
|
||||||
|
-- Delete
|
||||||
|
-- path = path where worktree deleted
|
||||||
|
|
||||||
|
Worktree.on_tree_change(function(op, metadata)
|
||||||
|
if op == Worktree.Operations.Switch then
|
||||||
|
print("Switched from " .. metadata.prev_path .. " to " .. metadata.path)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>bw", require("telescope").extensions.git_worktree.git_worktrees, { desc = "[B]rowse Git Worktrees" })
|
||||||
|
vim.keymap.set("n", "<leader>cw", require("telescope").extensions.git_worktree.create_git_worktree, { desc = "[C]reate Git [W]orktree" })
|
@ -0,0 +1,2 @@
|
|||||||
|
pcall(require("telescope").load_extension, "ui-select")
|
||||||
|
pcall(require("telescope").load_extension, "live_grep_args")
|
@ -0,0 +1,22 @@
|
|||||||
|
local lsp = require 'lspconfig'
|
||||||
|
lsp.solargraph.setup {
|
||||||
|
cmd = { os.getenv("HOME") .. "/.asdf/shims/solargraph", '--stdio' },
|
||||||
|
filetypes = { "ruby", "rakefile" },
|
||||||
|
settings = {
|
||||||
|
solargraph = {
|
||||||
|
-- root_dir = nvim_lsp.util.root_pattern("Gemfile", ".git", "."),
|
||||||
|
-- root_dir = root_pattern("Gemfile", ".git"),
|
||||||
|
settings = {
|
||||||
|
solargraph = {
|
||||||
|
autoformat = true,
|
||||||
|
completion = true,
|
||||||
|
diagnostic = true,
|
||||||
|
folding = true,
|
||||||
|
references = true,
|
||||||
|
rename = true,
|
||||||
|
symbols = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue