update nvim config and junk
This commit is contained in:
parent
e1aac7d093
commit
c3dbc10c80
|
@ -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")
|
|
@ -228,14 +228,14 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
-- {
|
||||||
-- Add indentation guides even on blank lines
|
-- -- Add indentation guides even on blank lines
|
||||||
'lukas-reineke/indent-blankline.nvim',
|
-- 'lukas-reineke/indent-blankline.nvim',
|
||||||
-- Enable `lukas-reineke/indent-blankline.nvim`
|
-- -- Enable `lukas-reineke/indent-blankline.nvim`
|
||||||
-- See `:help ibl`
|
-- -- See `:help ibl`
|
||||||
main = 'ibl',
|
-- main = 'ibl',
|
||||||
opts = {},
|
-- opts = {},
|
||||||
},
|
-- },
|
||||||
|
|
||||||
-- "gc" to comment visual regions/lines
|
-- "gc" to comment visual regions/lines
|
||||||
{ 'numToStr/Comment.nvim', opts = {} },
|
{ 'numToStr/Comment.nvim', opts = {} },
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
|
"LuaSnip": { "branch": "master", "commit": "cdbf6f41381e5ee4810b4b09284b603d8f18365d" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||||
|
@ -8,8 +8,7 @@
|
||||||
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
|
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
|
||||||
"git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
|
"git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
|
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
|
"lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
|
|
||||||
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
|
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
|
||||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
|
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
|
||||||
|
@ -21,14 +20,15 @@
|
||||||
"nvim-dap-go": { "branch": "main", "commit": "64f73400761e2d19459e664a52ea478f3a4420e7" },
|
"nvim-dap-go": { "branch": "main", "commit": "64f73400761e2d19459e664a52ea478f3a4420e7" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
|
"nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
|
||||||
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
|
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" },
|
"nvim-lspconfig": { "branch": "master", "commit": "b1a11b042d015df5b8f7f33aa026e501b639c649" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
|
"nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "6e2b56cbe75ddf18e6efecee44bc3936d70b0b3e" },
|
"nvim-treesitter": { "branch": "master", "commit": "db12bd416e2764420047e4a5d6b96fe44e4377d5" },
|
||||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
|
"nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
|
||||||
"onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
|
"onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
|
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
|
||||||
"refactoring.nvim": { "branch": "master", "commit": "1b593e7203b31c7bde3fa638e6869144698df3b6" },
|
"refactoring.nvim": { "branch": "master", "commit": "94444558fc651b7e36f39d86c518e44b4de15123" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
|
||||||
|
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "20656efd7a0dbb4483290649c9671af14b0cfb0d" },
|
||||||
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
||||||
"tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" },
|
"tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
|
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
|
||||||
|
|
|
@ -51,4 +51,18 @@ return {
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"nvim-telescope/telescope.nvim",
|
||||||
|
dependencies = {
|
||||||
|
{
|
||||||
|
"nvim-telescope/telescope-live-grep-args.nvim",
|
||||||
|
-- This will not install any breaking changes.
|
||||||
|
-- For major updates, this must be adjusted manually.
|
||||||
|
version = "^1.0.0",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("telescope").load_extension("live_grep_args")
|
||||||
|
end
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,2 +1,3 @@
|
||||||
.cfg
|
.cfg
|
||||||
.tool-versions
|
.tool-versions
|
||||||
|
undodir
|
||||||
|
|
Loading…
Reference in New Issue