update
This commit is contained in:
1 parent
19d9347db9
commit
3ac528c554
72 files changed
+1734
-3140
No files matched your search
@@ -1,22 +1,21 @@
|
||||
local keys = {}
|
||||
|
||||
-- stylua: ignore start
|
||||
for i = 1, 9 do
|
||||
table.insert(keys, { "<leader>b" .. i, "<cmd>BufferLineGoToBuffer " .. i .. "<cr>", desc = "Buffer " .. i })
|
||||
end
|
||||
|
||||
table.insert(keys, { "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" })
|
||||
table.insert(keys, { "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" })
|
||||
table.insert(keys, { "<leader>.", "<Cmd>BufferLinePick<CR>", desc = "Pick Buffer" })
|
||||
|
||||
table.insert(keys, { "<leader>bS", "<Cmd>BufferLineSortByDirectory<CR>", desc = "Sort By Directory" })
|
||||
table.insert(keys, { "<leader>bs", "<Cmd>BufferLineSortByExtension<CR>", desc = "Sort By Extensions" })
|
||||
-- stylua: ignore end
|
||||
|
||||
return {
|
||||
"akinsho/bufferline.nvim",
|
||||
keys = {
|
||||
{ "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" },
|
||||
{ "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" },
|
||||
{ "<leader>.", "<Cmd>BufferLinePick<CR>", desc = "Pick Buffer" },
|
||||
{ "<leader>bS", "<Cmd>BufferLineSortByDirectory<CR>", desc = "Sort By Directory" },
|
||||
{ "<leader>bs", "<Cmd>BufferLineSortByExtension<CR>", desc = "Sort By Extensions" },
|
||||
{ "<leader>b1", "<cmd>BufferLineGoToBuffer 1<cr>", desc = "Buffer 1" },
|
||||
{ "<leader>b2", "<cmd>BufferLineGoToBuffer 2<cr>", desc = "Buffer 2" },
|
||||
{ "<leader>b3", "<cmd>BufferLineGoToBuffer 3<cr>", desc = "Buffer 3" },
|
||||
{ "<leader>b4", "<cmd>BufferLineGoToBuffer 4<cr>", desc = "Buffer 4" },
|
||||
{ "<leader>b5", "<cmd>BufferLineGoToBuffer 5<cr>", desc = "Buffer 5" },
|
||||
{ "<leader>b6", "<cmd>BufferLineGoToBuffer 6<cr>", desc = "Buffer 6" },
|
||||
{ "<leader>b7", "<cmd>BufferLineGoToBuffer 7<cr>", desc = "Buffer 7" },
|
||||
{ "<leader>b8", "<cmd>BufferLineGoToBuffer 8<cr>", desc = "Buffer 8" },
|
||||
{ "<leader>b9", "<cmd>BufferLineGoToBuffer 9<cr>", desc = "Buffer 9" },
|
||||
{ "<leader>b0", "<cmd>BufferLineGoToBuffer -1<cr>", desc = "Buffer -1" },
|
||||
},
|
||||
keys = keys,
|
||||
opts = {
|
||||
options = {
|
||||
modified_icon = "",
|
||||
|
||||
@@ -30,7 +30,7 @@ return {
|
||||
return vim.fn["codeium#Clear"]()
|
||||
end, opts)
|
||||
|
||||
vim.keymap.set("n", "<leader>cI", "<cmd>CodeiumToggle<cr>", { desc = "Toggle IA" })
|
||||
vim.keymap.set("n", "<leader>cI", "<cmd>CodeiumToggle<cr>", { desc = "Toggle IA (Codeium)" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
return {
|
||||
"jellydn/gen.nvim",
|
||||
opts = {
|
||||
model = "codellama",
|
||||
display_mode = "split",
|
||||
show_prompt = true,
|
||||
show_model = true,
|
||||
no_auto_close = false,
|
||||
init = function(options)
|
||||
pcall(io.popen, "ollama serve > /dev/null 2>&1 &")
|
||||
end,
|
||||
command = "curl --silent --no-buffer -X POST http://localhost:11434/api/generate -d $body",
|
||||
},
|
||||
config = function(_, opts)
|
||||
local gen = require("gen")
|
||||
gen.setup(opts)
|
||||
|
||||
gen.prompts["Elaborate_Text"] = {
|
||||
prompt = "Elaborate the following text:\n$text",
|
||||
}
|
||||
gen.prompts["Fix_Code"] = {
|
||||
prompt = "Fix the following code. Only output the result in format ```$filetype\n...\n```:\n```$filetype\n$text\n```",
|
||||
extract = "```$filetype\n(.-)```",
|
||||
}
|
||||
end,
|
||||
keys = {
|
||||
{ "<leader>i", "<cmd>Gen<cr>", mode = { "n", "v" }, desc = "IA (Gen)" },
|
||||
},
|
||||
}
|
||||
@@ -29,6 +29,7 @@ return {
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<leader>ag", "<Cmd>DookuGenerate<CR>", desc = "Generate HTML Docs" },
|
||||
{ "<leader>ao", "<Cmd>DookuOpen<CR>", desc = "Open HTML Docs" },
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -12,14 +12,15 @@ return {
|
||||
},
|
||||
},
|
||||
},
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<F5>", function() require("dap").continue() end, desc = "Debug: Continue" },
|
||||
{ "<F10>", function() require("dap").step_over() end, desc = "Debug: Step over" },
|
||||
{ "<F11>", function() require("dap").step_into() end, desc = "Debug: Step into" },
|
||||
{ "<F12>", function() require("dap").step_out() end, desc = "Debug: Step out" },
|
||||
{ "<F2>", function() require("dap").toggle_breakpoint() end, desc = "Debug: Toggle breakpoint" },
|
||||
},
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<F5>", function() require("dap").continue() end, desc = "Debug: Continue" },
|
||||
{ "<F10>", function() require("dap").step_over() end, desc = "Debug: Step over" },
|
||||
{ "<F11>", function() require("dap").step_into() end, desc = "Debug: Step into" },
|
||||
{ "<F12>", function() require("dap").step_out() end, desc = "Debug: Step out" },
|
||||
{ "<F2>", function() require("dap").toggle_breakpoint() end, desc = "Debug: Toggle breakpoint" },
|
||||
{ "<S-F2>", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
return {
|
||||
"kristijanhusak/vim-carbon-now-sh",
|
||||
cmd = { "CarbonNowSh" },
|
||||
keys = {
|
||||
{ "<leader>cS", ":CarbonNowSh<cr>", mode = { "n", "v" }, desc = "Screenshot Code", silent = true },
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
return {
|
||||
{
|
||||
"https://codeberg.org/esensar/nvim-dev-container",
|
||||
cmd = {
|
||||
"DevcontainerStart",
|
||||
"DevcontainerStop",
|
||||
"DevcontainerLogs",
|
||||
"DevcontainerEditNearestConfig",
|
||||
"DevcontainerAttach",
|
||||
"DevcontainerExec",
|
||||
"DevcontainerStopAll",
|
||||
"DevcontainerRemoveAll",
|
||||
},
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
opts = {},
|
||||
keys = {
|
||||
{ "<leader>os", "<cmd>DevcontainerStart<cr>", desc = "Start" },
|
||||
{ "<leader>oS", "<cmd>DevcontainerStop<cr>", desc = "Stop" },
|
||||
{ "<leader>ol", "<cmd>DevcontainerLogs<cr>", desc = "Log" },
|
||||
{ "<leader>oc", "<cmd>DevcontainerEditNearestConfig<cr>", desc = "Config" },
|
||||
{ "<leader>oa", "<cmd>DevcontainerAttach<cr>", desc = "Attach" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>o"] = { name = " c[o]ntainers" },
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -15,12 +15,12 @@ return {
|
||||
{ "n", "<leader>gCt", actions.conflict_choose("theirs"), { desc = "Choose the THEIRS version of a conflict" } },
|
||||
{ "n", "<leader>gCb", actions.conflict_choose("base"), { desc = "Choose the BASE version of a conflict" } },
|
||||
{ "n", "<leader>gCa", actions.conflict_choose("all"), { desc = "Choose all the versions of a conflict" } },
|
||||
{ "n", "<leader>gCx", actions.conflict_choose("none"), { desc = "Delete the conflict region" } },
|
||||
{ "n", "<leader>gCx", actions.conflict_choose("none"), { desc = "Delete the conflict region" } },
|
||||
{ "n", "<leader>gCO", actions.conflict_choose_all("ours"), { desc = "Choose the OURS version of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCT", actions.conflict_choose_all("theirs"), { desc = "Choose the THEIRS version of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCB", actions.conflict_choose_all("base"), { desc = "Choose the BASE version of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCA", actions.conflict_choose_all("all"), { desc = "Choose all the versions of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } },
|
||||
{ "n", "<leader>gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } },
|
||||
},
|
||||
--stylua: ignore
|
||||
file_panel = {
|
||||
@@ -28,7 +28,7 @@ return {
|
||||
{ "n", "<leader>gCT", actions.conflict_choose_all("theirs"), { desc = "Choose the THEIRS version of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCB", actions.conflict_choose_all("base"), { desc = "Choose the BASE version of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCA", actions.conflict_choose_all("all"), { desc = "Choose all the versions of a conflict for the whole file" } },
|
||||
{ "n", "<leader>gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } },
|
||||
{ "n", "<leader>gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } },
|
||||
},
|
||||
}
|
||||
end,
|
||||
|
||||
@@ -1,3 +1,18 @@
|
||||
local keys = {}
|
||||
|
||||
-- stylua: ignore start
|
||||
for i = 1, 9 do
|
||||
table.insert(keys, { "<leader>h" .. i, function() require("harpoon"):list():select(i) end, desc = "File " .. i })
|
||||
end
|
||||
|
||||
table.insert(keys, { "<leader>ha", function() require("harpoon"):list():append() end, desc = "Add Mark" })
|
||||
table.insert(keys, { "<leader>hh", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Menu" })
|
||||
table.insert(keys, { "<leader>hf", "<cmd>Telescope harpoon marks<CR>", desc = "Files" })
|
||||
|
||||
table.insert(keys, { "]H", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" })
|
||||
table.insert(keys, { "[H", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" })
|
||||
-- stylua: ignore end
|
||||
|
||||
return {
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
@@ -6,24 +21,7 @@ return {
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
--stylua: ignore
|
||||
keys = {
|
||||
{ "<leader>ha", function() require("harpoon"):list():append() end, desc = "Add Mark" },
|
||||
{ "<leader>hh", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Menu" },
|
||||
{ "<leader>hf", "<cmd>Telescope harpoon marks<CR>", desc = "Files" },
|
||||
{ "<leader>h1", function() require("harpoon"):list():select(1) end, desc = "File 1" },
|
||||
{ "<leader>h2", function() require("harpoon"):list():select(2) end, desc = "File 2" },
|
||||
{ "<leader>h3", function() require("harpoon"):list():select(3) end, desc = "File 3" },
|
||||
{ "<leader>h4", function() require("harpoon"):list():select(4) end, desc = "File 4" },
|
||||
{ "<leader>h5", function() require("harpoon"):list():select(5) end, desc = "File 5" },
|
||||
{ "<leader>h6", function() require("harpoon"):list():select(6) end, desc = "File 6" },
|
||||
{ "<leader>h7", function() require("harpoon"):list():select(7) end, desc = "File 7" },
|
||||
{ "<leader>h8", function() require("harpoon"):list():select(8) end, desc = "File 8" },
|
||||
{ "<leader>h9", function() require("harpoon"):list():select(9) end, desc = "File 9" },
|
||||
{ "]H", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" },
|
||||
{ "[H", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" },
|
||||
{ "<M-]>", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" },
|
||||
{ "<M-[>", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" },
|
||||
},
|
||||
keys = keys,
|
||||
config = function()
|
||||
local harpoon = require("harpoon")
|
||||
harpoon:setup({})
|
||||
|
||||
@@ -13,6 +13,6 @@ return {
|
||||
},
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<leader><bs>", function() require("oil").toggle_float() end, desc = "Toggle oil" },
|
||||
{ "<leader>;", function() require("oil").toggle_float() end, desc = "Toggle oil" },
|
||||
},
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
return {
|
||||
"TobinPalmer/rayso.nvim",
|
||||
cmd = { "Rayso" },
|
||||
keys = {
|
||||
{ "<leader>cS", "<cmd>Rayso<cr>", mode = { "n" }, desc = "Screenshot Code" },
|
||||
{ "<leader>cS", "<cmd>'<,'>Rayso<cr>", mode = { "v" }, desc = "Screenshot Selection" },
|
||||
},
|
||||
opts = {
|
||||
open_cmd = "librewolf",
|
||||
},
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
return {
|
||||
"axieax/urlview.nvim",
|
||||
dependencies = { "nvim-telescope/telescope.nvim" },
|
||||
cmd = { "UrlView" },
|
||||
keys = { { "<leader>sU", "<cmd>UrlView<cr>", desc = "Search Urls" } },
|
||||
opts = {
|
||||
|
||||
@@ -4,18 +4,9 @@ return {
|
||||
cmd = { "FloatermNew", "FloatermToggle", "FloatermNext", "FloatermPrev", "FloatermLast", "FloatermFirst" },
|
||||
--stylua: ignore
|
||||
keys = {
|
||||
{ "<leader>Ts", "<cmd>FloatermNew --disposable --name=duaroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> dua i<CR>", desc = "Workspace Size (root dir)" },
|
||||
{ "<leader>TS", "<cmd>FloatermNew --disposable --name=duabuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> dua i<CR>", desc = "Workspace Size (cwd)" },
|
||||
{ "<A-e>", "<cmd>FloatermNew --disposable --name=yaziroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> yazi<CR>", desc = "File Explorer (root dir)" },
|
||||
{ "<A-e>", "<cmd>FloatermNew --disposable --name=yaziroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> yazi<CR>", desc = "Yazi" },
|
||||
{ "<leader>gg", "<cmd>FloatermNew --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>", desc = "Lazygit (root dir)" },
|
||||
{ "<leader>gG", "<cmd>FloatermNew --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
|
||||
{ "<leader>Td", "<cmd>FloatermNew --disposable --name=lazydocker --opener=edit --titleposition=center --height=0.85 --width=0.85 lazydocker<CR>", desc = "Lazydocker" },
|
||||
{ "<leader>Tb", "<cmd>FloatermNew --disposable --name=btop --opener=edit --titleposition=center --height=0.85 --width=0.85 btop<CR>", desc = "Btop" },
|
||||
{ "<leader>Tn", "<cmd>FloatermNew --disposable --name=navi --opener=edit --titleposition=center --height=0.85 --width=0.85 pages<CR>", desc = "Navi Pages" },
|
||||
{ "<leader>Tp", "<cmd>FloatermNew --disposable --name=proc --opener=edit --titleposition=center --height=0.85 --width=0.85 proc<CR>", desc = "Systemd Processes" },
|
||||
{ "<leader>TB", "<cmd>FloatermNew --disposable --name=bandwhich --opener=edit --titleposition=center --height=0.85 --width=0.85 bandwhich<CR>", desc = "Bandwidth" },
|
||||
{ "<leader>gF", "<cmd>FloatermNew --disposable --name=forgit --opener=edit --titleposition=center --height=0.85 --width=0.85 fgit<CR>", desc = "Forgit" },
|
||||
{ "<leader>gf", "<cmd>FloatermNew! --disposable --name=onefetch --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> gfetch<CR>", desc = "Gitfetch" },
|
||||
{ "<leader>cen", "<cmd>FloatermNew --name=node --opener=edit --titleposition=center --wintype=split --height=0.35 node<CR>", desc = "Node" },
|
||||
{ "<leader>cep", "<cmd>FloatermNew --name=python --opener=edit --titleposition=center --wintype=split --height=0.35 python<CR>", desc = "Python" },
|
||||
{ "<S-Right>", "<Esc><Esc><cmd>FloatermNext<CR>", mode = { "t" }, desc = "Next Terminal" },
|
||||
@@ -46,7 +37,6 @@ return {
|
||||
defaults = {
|
||||
["<leader>ce"] = { name = "r[e]pl" },
|
||||
["<leader>ft"] = { name = "terminals" },
|
||||
["<leader>T"] = { name = " tools" },
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -4,7 +4,7 @@ return {
|
||||
"williamboman/mason.nvim",
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
vim.list_extend(opts.ensure_installed, { "golangcil-lint" })
|
||||
vim.list_extend(opts.ensure_installed, { "golangci-lint" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
@@ -15,7 +15,6 @@ return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
opts = {},
|
||||
event = { "LazyFile" },
|
||||
ft = { "go", "gomod" },
|
||||
build = function()
|
||||
require("go.install").update_all_sync()
|
||||
|
||||
@@ -4,6 +4,18 @@ return {
|
||||
"simrat39/rust-tools.nvim",
|
||||
enabled = false,
|
||||
},
|
||||
-- TODO: Look at crates lsp
|
||||
-- {
|
||||
-- "Saecki/crates.nvim",
|
||||
-- opts = {
|
||||
-- lsp = {
|
||||
-- enabled = true,
|
||||
-- on_attach = function(client, bufnr) end,
|
||||
-- actions = true,
|
||||
-- completion = true,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
{
|
||||
"mrcjkb/rustaceanvim",
|
||||
version = "^3", -- Recommended
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
local source_action = function(name)
|
||||
return function()
|
||||
vim.lsp.buf.code_action({
|
||||
apply = true,
|
||||
context = {
|
||||
only = { string.format("source.%s.ts", name) },
|
||||
diagnostics = {},
|
||||
},
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
local inlayHints = {
|
||||
includeInlayParameterNameHints = "all",
|
||||
includeInlayParameterNameHintsWhenArgumentMatchesName = true,
|
||||
@@ -47,6 +59,23 @@ return {
|
||||
inlayHints = inlayHints,
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>co",
|
||||
source_action("organizeImports"),
|
||||
desc = "Organize Imports",
|
||||
},
|
||||
{
|
||||
"<leader>cM",
|
||||
source_action("addMissingImports"),
|
||||
desc = "Add Missing Imports",
|
||||
},
|
||||
{
|
||||
"<leader>cR",
|
||||
source_action("removeUnused"),
|
||||
desc = "Remove Unused Imports",
|
||||
},
|
||||
},
|
||||
},
|
||||
denols = {
|
||||
root_dir = require("lspconfig").util.root_pattern("deno.json", "deno.jsonc", "deno.lock"),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local macchiato = require("catppuccin.palettes").get_palette("macchiato")
|
||||
local palette = require("catppuccin.palettes").get_palette("macchiato") -- Import your favorite catppuccin colors
|
||||
|
||||
return {
|
||||
{
|
||||
@@ -14,6 +14,23 @@ return {
|
||||
dark = "macchiato",
|
||||
},
|
||||
term_colors = true,
|
||||
custom_highlights = function()
|
||||
return {
|
||||
FloatermBorder = { fg = palette.base },
|
||||
TelescopeMatching = { fg = palette.blue },
|
||||
TelescopeSelection = { fg = palette.text, bg = palette.surface0, bold = true },
|
||||
TelescopePromptPrefix = { bg = palette.surface0 },
|
||||
TelescopePromptNormal = { bg = palette.surface0 },
|
||||
TelescopeResultsNormal = { bg = palette.mantle },
|
||||
TelescopePreviewNormal = { bg = palette.mantle },
|
||||
TelescopePromptBorder = { bg = palette.surface0, fg = palette.surface0 },
|
||||
TelescopeResultsBorder = { bg = palette.mantle, fg = palette.mantle },
|
||||
TelescopePreviewBorder = { bg = palette.mantle, fg = palette.mantle },
|
||||
TelescopePromptTitle = { bg = palette.red, fg = palette.mantle },
|
||||
TelescopeResultsTitle = { fg = palette.mantle },
|
||||
TelescopePreviewTitle = { bg = palette.green, fg = palette.mantle },
|
||||
}
|
||||
end,
|
||||
integrations = {
|
||||
alpha = true,
|
||||
cmp = true,
|
||||
@@ -71,7 +88,6 @@ return {
|
||||
semantic_tokens = true,
|
||||
telescope = {
|
||||
enabled = true,
|
||||
style = "nvchad",
|
||||
},
|
||||
symbols_outline = false,
|
||||
treesitter = true,
|
||||
@@ -87,8 +103,8 @@ return {
|
||||
styles = { "italic", "bold" },
|
||||
custom = {
|
||||
all = {
|
||||
fill = { bg = macchiato.mantle },
|
||||
background = { bg = macchiato.mantle },
|
||||
fill = { bg = palette.mantle },
|
||||
background = { bg = palette.mantle },
|
||||
},
|
||||
},
|
||||
}),
|
||||
|
||||
@@ -25,6 +25,7 @@ local enabled = {
|
||||
"nvim-various-textobjs",
|
||||
"nvim-ts-context-commentstring",
|
||||
"vim-repeat",
|
||||
"vim-carbon-now-sh",
|
||||
"highlight-undo.nvim",
|
||||
"ts-node-action",
|
||||
"LazyVim",
|
||||
@@ -40,9 +41,9 @@ vim.o.spell = false
|
||||
vim.notify = vscode.notify
|
||||
vim.g.clipboard = vim.g.vscode_clipboard
|
||||
|
||||
local function vscode_action(cmd)
|
||||
local function vscode_action(cmd, opts)
|
||||
return function()
|
||||
vscode.action(cmd)
|
||||
vscode.action(cmd, opts)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -58,16 +59,54 @@ vim.api.nvim_create_autocmd("User", {
|
||||
map("n", "<leader>ss", vscode_action("workbench.action.gotoSymbol"))
|
||||
-- view problems
|
||||
map("n", "<leader>xx", vscode_action("workbench.actions.view.problems"))
|
||||
-- open file explorer in left sidebar
|
||||
-- open file explorer
|
||||
map("n", "<leader>e", vscode_action("workbench.view.explorer"))
|
||||
-- Code Action
|
||||
map("n", "<leader>ca", vscode_action("editor.action.codeAction"))
|
||||
-- Open terminal
|
||||
map("n", "<leader>ft", vscode_action("workbench.action.terminal.focus"))
|
||||
-- toggle side bar
|
||||
map("n", "<leader>ue", vscode_action("workbench.action.toggleSidebarVisibility"))
|
||||
-- terminal
|
||||
map("n", [[<c-\>]], vscode_action("workbench.action.terminal.toggleTerminal"))
|
||||
map("n", "<leader>fts", vscode_action("workbench.action.terminal.newWithCwd"))
|
||||
-- close editor
|
||||
map("n", "<leader>bd", vscode_action("workbench.action.closeActiveEditor"))
|
||||
-- breakpoints
|
||||
map("n", "<F2>", vscode_action("editor.debug.action.toggleBreakpoint"))
|
||||
-- windows
|
||||
map("n", "<leader>|", vscode_action("workbench.action.splitEditorRight"))
|
||||
map("n", "<leader>-", vscode_action("workbench.action.splitEditorDown"))
|
||||
-- LSP actions
|
||||
map("n", "<leader>ca", vscode_action("editor.action.codeAction"))
|
||||
map("n", "gy", vscode_action("editor.action.goToTypeDefinition"))
|
||||
map("n", "gr", vscode_action("editor.action.goToReferences"))
|
||||
map("n", "gi", vscode_action("editor.action.goToImplementation"))
|
||||
map("n", "K", vscode_action("editor.action.showHover"))
|
||||
map("n", "<leader>cr", vscode_action("editor.action.rename"))
|
||||
map("n", "<leader>co", vscode_action("editor.action.organizeImport"))
|
||||
map("n", "<leader>cf", vscode_action("editor.action.formatDocument"))
|
||||
-- refactor
|
||||
map("n", "<leader>cR", vscode_action("editor.action.refactor"))
|
||||
-- markdown preview
|
||||
map("n", "<leader>cp", vscode_action("markdown.showPreviewToSide"))
|
||||
-- project manager
|
||||
map("n", "<leader>fp", vscode_action("projectManager.listProjects"))
|
||||
-- zoxide
|
||||
-- stylua: ignore
|
||||
map("n", "<leader>fz", vscode_action("terminalCommandKeys.run",
|
||||
{ args = { cmd = "cdzc", newTerminal = false, saveAllFiles = false, showTerminal = true, focus = true } }
|
||||
))
|
||||
-- zen mode
|
||||
map("n", "<leader>z", vscode_action("workbench.action.toggleZenMode"))
|
||||
-- cspell
|
||||
map("n", "<leader>!", vscode_action("cSpell.addWordToDictionary"))
|
||||
map("n", "<leader>us", vscode_action("cSpell.toggleEnableSpellChecker"))
|
||||
-- comments
|
||||
map("n", "<leader>xt", vscode_action("workspaceAnchors.focus"))
|
||||
-- git
|
||||
map("n", "<leader>gg", vscode_action("gitlens.views.home.focus"))
|
||||
map("n", "<leader>ub", vscode_action("gitlens.toggleFileBlame"))
|
||||
-- statusline
|
||||
map("n", "<leader>uS", vscode_action("workbench.action.toggleStatusbarVisibility"))
|
||||
-- markdown preview
|
||||
map("n", "<leader>cp", vscode_action("markdown.showPreviewToSide"))
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ return {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
opts = {
|
||||
yadm = { enable = true },
|
||||
current_line_blame = true,
|
||||
current_line_blame_opts = {
|
||||
virt_text = true,
|
||||
virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
|
||||
@@ -13,6 +12,6 @@ return {
|
||||
keys = {
|
||||
-- stylua: ignore
|
||||
{ "<leader>ub", "<cmd>Gitsigns toggle_current_line_blame<CR>", desc = "Toggle Line Blame" },
|
||||
{ "<leader>uD", "<cmd>Gitsigns toggle_deleted<CR>", desc = "Toggle Deletions Inline" },
|
||||
{ "<leader>ghd", "<cmd>Gitsigns toggle_deleted<CR>", desc = "Deletions Inline" },
|
||||
},
|
||||
}
|
||||
Reference in new issue
Block a user