Compare commits
2 commits
38b3000be6
...
4cb5bb7608
Author | SHA1 | Date | |
---|---|---|---|
4cb5bb7608 | |||
ef5f1dfc5f |
3 changed files with 151 additions and 89 deletions
|
@ -65,6 +65,17 @@ vim.keymap.set("n", "<leader>cd", ":Copilot disable<CR>", { desc = "Disable Copi
|
|||
vim.keymap.set("n", "<leader>cc", ":CopilotChatToggle<CR>", { desc = "Toggle Copilot Chat" })
|
||||
vim.keymap.set("n", "<leader>cx", ":CopilotChatReset<CR>", { desc = "Reset Copilot Chat" })
|
||||
|
||||
-- Configure Buffer Navigation
|
||||
vim.keymap.set("n", "<A-left>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
|
||||
vim.keymap.set("n", "<A-right>", ":BufferNext<CR>", { desc = "Next Buffer" })
|
||||
vim.keymap.set("n", "<A-h>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
|
||||
vim.keymap.set("n", "<A-l>", ":BufferNext<CR>", { desc = "Next Buffer" })
|
||||
vim.keymap.set("n", "<leader>bq", ":BufferClose<CR>", { desc = "Close Buffer" })
|
||||
vim.keymap.set("n", "<leader>bQ", ":BufferWipeout<CR>", { desc = "Wipeout Buffer" })
|
||||
vim.keymap.set("n", "<A-q>", ":BufferClose<CR>", { desc = "Close Buffer" })
|
||||
vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
|
||||
vim.keymap.set("n", "<leader>bn", ":BufferNext<CR>", { desc = "Next Buffer" })
|
||||
|
||||
-- Configure f-key shortcuts
|
||||
vim.keymap.set("n", "<F1>", vim.lsp.buf.hover)
|
||||
vim.keymap.set("i", "<F1>", vim.lsp.buf.hover)
|
||||
|
|
|
@ -12,7 +12,54 @@ return {
|
|||
sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { "branch", "diff", "diagnostics" },
|
||||
lualine_c = { { "filename", path = 1 } },
|
||||
lualine_c = {
|
||||
{ "filename", path = 1 },
|
||||
|
||||
-- Determine class/function name
|
||||
function()
|
||||
local current_buff = vim.api.nvim_get_current_buf()
|
||||
local current_node = vim.treesitter.get_node()
|
||||
if not current_node then
|
||||
return ""
|
||||
end
|
||||
local class = nil
|
||||
local func = nil
|
||||
local expr = current_node
|
||||
while expr do
|
||||
if expr:type() == "function_definition" then
|
||||
func = expr
|
||||
elseif expr:type() == "class_definition" then
|
||||
class = expr
|
||||
end
|
||||
expr = expr:parent()
|
||||
end
|
||||
|
||||
if not func then
|
||||
return ""
|
||||
end
|
||||
for child in func:iter_children() do
|
||||
if child:type() == "identifier" then
|
||||
func = child
|
||||
break
|
||||
end
|
||||
end
|
||||
local func_text = vim.treesitter.get_node_text(func, current_buff)
|
||||
if class then
|
||||
for child in class:iter_children() do
|
||||
if child:type() == "identifier" then
|
||||
class = child
|
||||
break
|
||||
end
|
||||
end
|
||||
func_text = vim.treesitter.get_node_text(class, current_buff) .. ":" .. func_text
|
||||
end
|
||||
if vim.bo.filetype == "lua" then
|
||||
-- Patch out invalid parsing of lua (and other?) files
|
||||
return ""
|
||||
end
|
||||
return func_text
|
||||
end,
|
||||
},
|
||||
lualine_x = { "encoding", "filetype" },
|
||||
lualine_y = {
|
||||
function()
|
||||
|
@ -32,14 +79,15 @@ return {
|
|||
end,
|
||||
},
|
||||
{
|
||||
|
||||
"romgrk/barbar.nvim",
|
||||
tag = "v1.9.0",
|
||||
--init = function()
|
||||
-- vim.g.barbar_auto_setup = false
|
||||
--end,
|
||||
tag = "v1.9.1",
|
||||
init = function()
|
||||
vim.g.barbar_auto_setup = false
|
||||
end,
|
||||
opts = {
|
||||
animation = false,
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
|
@ -54,22 +102,18 @@ return {
|
|||
},
|
||||
},
|
||||
{
|
||||
"yegappan/taglist",
|
||||
vim.keymap.set("n", "<leader>fs", ":TlistToggle<CR>", { desc = "Toggle Taglist" }),
|
||||
vim.cmd("let Tlist_Use_Right_Window = 1"),
|
||||
vim.cmd("let Tlist_Show_One_File = 1"),
|
||||
vim.cmd("let Tlist_WinWidth = 50"),
|
||||
"preservim/tagbar",
|
||||
vim.keymap.set("n", "<leader>fs", ":TagbarToggle<CR>", { desc = "Toggle Tagbar" }),
|
||||
},
|
||||
--{
|
||||
-- "yegappan/taglist",
|
||||
-- vim.keymap.set("n", "<leader>fs", ":TlistToggle<CR>", { desc = "Toggle Taglist" }),
|
||||
-- vim.cmd("let Tlist_Use_Right_Window = 1"),
|
||||
-- vim.cmd("let Tlist_Show_One_File = 1"),
|
||||
-- vim.cmd("let Tlist_WinWidth = 50"),
|
||||
--},
|
||||
{
|
||||
"goolord/alpha-nvim",
|
||||
vim.keymap.set("n", "<A-left>", ":BufferPrevious<CR>", { desc = "Previous Buffer" }),
|
||||
vim.keymap.set("n", "<A-right>", ":BufferNext<CR>", { desc = "Next Buffer" }),
|
||||
vim.keymap.set("n", "<A-h>", ":BufferPrevious<CR>", { desc = "Previous Buffer" }),
|
||||
vim.keymap.set("n", "<A-l>", ":BufferNext<CR>", { desc = "Next Buffer" }),
|
||||
vim.keymap.set("n", "<leader>bq", ":BufferClose<CR>", { desc = "Close Buffer" }),
|
||||
vim.keymap.set("n", "<A-q>", ":BufferClose<CR>", { desc = "Close Buffer" }),
|
||||
vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" }),
|
||||
vim.keymap.set("n", "<leader>bn", ":BufferNext<CR>", { desc = "Next Buffer" }),
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
local alpha = require("alpha")
|
||||
|
|
|
@ -8,6 +8,13 @@ return {
|
|||
},
|
||||
{
|
||||
"pocco81/auto-save.nvim",
|
||||
event = { "InsertLeave", "TextChanged" },
|
||||
config = function()
|
||||
require("auto-save").setup({
|
||||
enabled = true,
|
||||
trigger_events = { "InsertLeave", "TextChanged" },
|
||||
})
|
||||
end,
|
||||
keys = {
|
||||
{ "<leader>as", "<cmd>ASToggle<cr>", desc = "Toggle Auto Save" },
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue