feat: add undotree

This commit is contained in:
2025-08-18 12:36:04 -07:00
parent ab3d0c868f
commit 1477836e91
7 changed files with 51 additions and 15 deletions

View File

@@ -1,5 +1,6 @@
{ {
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
"barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
"cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
@@ -24,5 +25,6 @@
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" }, "telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" },
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" } "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
} }

View File

@@ -0,0 +1,5 @@
return {
{
"romgrk/barbar.nvim",
}
}

View File

@@ -23,6 +23,26 @@ local function setup_luau()
}) })
end end
local function setup_lua()
require("lspconfig").lua_ls.setup({
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
},
workspace = {
library = vim.api.nvim_get_runtime_file('', true),
checkThirdParty = false,
},
}
}
})
end
local function setup_ts()
require("lspconfig").ts_ls.setup({})
end
return { return {
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
@@ -45,7 +65,6 @@ return {
ensure_installed = { ensure_installed = {
"ts_ls", "ts_ls",
"lua_ls", "lua_ls",
"luau_lsp",
"rust_analyzer", "rust_analyzer",
"nil_ls", "nil_ls",
"tailwindcss", "tailwindcss",
@@ -54,9 +73,11 @@ return {
"gopls", "gopls",
"templ", "templ",
}, },
automatic_enable = { exclude = { "luau_lsp" } }, automatic_enable = { exclude = { "luau_lsp", "lua_ls" } },
}) })
setup_luau() setup_luau()
setup_lua()
setup_ts()
end, end,
}, },
} }

View File

@@ -1,16 +1,12 @@
return { return {
{ {
"rose-pine/neovim", "rose-pine/neovim",
dependencies = { dependencies = {
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
},
config = function()
require("rose-pine").setup({
styles = {
transparency = false,
},
})
vim.cmd.colorscheme("rose-pine")
end,
}, },
config = function()
require("rose-pine").setup()
vim.cmd.colorscheme("rose-pine")
end,
},
} }

View File

@@ -0,0 +1,5 @@
return {
{
"mbbill/undotree",
}
}

View File

@@ -1,2 +1,5 @@
vim.g.mapleader = " "
vim.keymap.set("n", "<leader>x", vim.cmd.q) vim.keymap.set("n", "<leader>x", vim.cmd.q)
vim.keymap.set("v", "<leader>y", '"+y', { noremap = true, silent = true }) vim.keymap.set("v", "<leader>y", '"+y', { noremap = true, silent = true })
vim.keymap.set("n", "<leader>q", ":BufferClose<CR>:q<CR>")
vim.keymap.set("n", "<leader>F5", vim.cmd.UndotreeToggle)

4
aliases/atmux.sh Executable file
View File

@@ -0,0 +1,4 @@
session=$(tmux ls | fzf | cut -d: -f1)
if [ -n "$session" ]; then
tmux a -t "$session"
fi