Compare commits
No commits in common. "2dd3d4fe68ba7cd0515f78a31f3db3e59bc3ae0a" and "4d59d38f43cf48f74b44a8be2ee6df14fd109917" have entirely different histories.
2dd3d4fe68
...
4d59d38f43
@ -1,59 +1,53 @@
|
||||
{
|
||||
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
|
||||
"LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" },
|
||||
"avante.nvim": { "branch": "main", "commit": "87c4c6b4937d1884960759aba4a0e42645688f2f" },
|
||||
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
||||
"avante.nvim": { "branch": "main", "commit": "4749e4ea1aff653a9e6f6e542d390e3c7560d161" },
|
||||
"ayu-vim": { "branch": "master", "commit": "01faacb4cb76e8cf72ad9858c581d80876260ab3" },
|
||||
"barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
|
||||
"blame.nvim": { "branch": "main", "commit": "b87b8c820e4cec06fbbd2f946b7b35c45906ee0c" },
|
||||
"calendar-vim": { "branch": "master", "commit": "2083a41e2d310f9bbbbf644517f30e901f1fb04d" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
|
||||
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
|
||||
"copilot.lua": { "branch": "master", "commit": "96e1bb1963f351700bf6737ef3695e8a0b90b12a" },
|
||||
"copilot.lua": { "branch": "master", "commit": "d296017e588215df3f7b5796d1172f0d690fa13c" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"fzf-lua": { "branch": "main", "commit": "8adf950093af5361621cf52208d64995b1af78b5" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
|
||||
"gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" },
|
||||
"hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" },
|
||||
"img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" },
|
||||
"fzf-lua": { "branch": "main", "commit": "ac6a34ea39831ec71c14f72075facf377ea9a00d" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "9cd665f46ab7af2e49d140d328b8e72ea1cf511b" },
|
||||
"gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
|
||||
"img-clip.nvim": { "branch": "main", "commit": "24c13df08e3fe66624bed5350a2a780f77f1f65b" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "ce0e87c0be12e7c48296a7513e90430e3eac7f24" },
|
||||
"mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"material.vim": { "branch": "main", "commit": "cecac931e8bd9e3d2cbb7c1e24ddb98887176f68" },
|
||||
"mini.pick": { "branch": "main", "commit": "fa1e449e1080bf7aa9b2890ee186d23b1b4e1287" },
|
||||
"neogit": { "branch": "master", "commit": "9b624f2caed2300489796ec16ad01fca1dc36963" },
|
||||
"neotest": { "branch": "master", "commit": "862afb2a2219d9ca565f67416fb7003cc0f22c4f" },
|
||||
"mini.pick": { "branch": "main", "commit": "ef479fcfb94b8f5fdbec46d697c18ca113547f3d" },
|
||||
"neogit": { "branch": "master", "commit": "9bb1e73c534f767607e0a888f3de4c942825c501" },
|
||||
"neotest": { "branch": "master", "commit": "dddbe8fe358b05b2b7e54fe4faab50563171a76d" },
|
||||
"nerdtree": { "branch": "master", "commit": "9b465acb2745beb988eff3c1e4aa75f349738230" },
|
||||
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
|
||||
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-dap": { "branch": "master", "commit": "f80de8ad944b1c464941cfcede597ab859060359" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "39dc331899521bbb4e102b614b71ab37464f8326" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" },
|
||||
"nvim-luadev": { "branch": "master", "commit": "3ba0c02c378503739f1fdb95cff3ea2aad48db3e" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "d26ce0126694283cf32bf1f4192ef37ef404c037" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
|
||||
"oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
|
||||
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"pycodestyle.nvim": { "branch": "master", "commit": "203ff9ffdc832dd125efa94dacf7ce898bbce100" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "dac01bd6660af337613e8cfcb23a4aec5d3c0e38" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "d6aaa19913415c653fa38aead4d9867628394510" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
|
||||
"tagbar": { "branch": "master", "commit": "8de7694c0aeda253073098bbc9fb890b2902ddb8" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
|
||||
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
|
||||
"unite.vim": { "branch": "master", "commit": "0ccb3f7988d61a9a86525374be97360bd20db6bc" },
|
||||
"vim-css-color": { "branch": "master", "commit": "14fd934cdd9ca1ac0e53511094e612eb9bace373" },
|
||||
"vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" },
|
||||
"vim-flake8": { "branch": "master", "commit": "a245098a174f30feff1b4387526876975042084a" },
|
||||
"vim-floaterm": { "branch": "master", "commit": "3bc4a5002906f500dea0a69407754109d4bd4950" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||
"vim-gitgutter": { "branch": "main", "commit": "6620e5fbbe6a28de0bfed081f5bd2767023b7eea" },
|
||||
"vim-js": { "branch": "master", "commit": "35d9e2ef4d31618237463e3bdf4811b2f8a0dec5" },
|
||||
@ -61,10 +55,8 @@
|
||||
"vim-latex-live-preview": { "branch": "master", "commit": "e1906cd4930a58ebaa5eb446436df23522eafb51" },
|
||||
"vim-plugin-AnsiEsc": { "branch": "master", "commit": "690f820d20b6e3a79ba20499874eb7333aa4ca5c" },
|
||||
"vim-vue": { "branch": "master", "commit": "6ae8fa751fbe4c6605961d2309f8326873fa40a6" },
|
||||
"vimtex": { "branch": "master", "commit": "08760834ce04903deb6f8760e61c11cf6f6b2f89" },
|
||||
"vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
|
||||
"vim-which-key": { "branch": "master", "commit": "4843811d6f2104fe2140d4cddbb49352976647df" },
|
||||
"vimtex": { "branch": "master", "commit": "bcb14eb6e3739f0c1902115a710292bc37c62d2e" },
|
||||
"wal.vim": { "branch": "master", "commit": "c72ba0d18946f29aab9c95eb6975d321c68b3681" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
|
||||
"yats.vim": { "branch": "master", "commit": "b325c449a2db4d9ee38aa441afa850a815982e8b" },
|
||||
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
|
||||
"yats.vim": { "branch": "master", "commit": "b325c449a2db4d9ee38aa441afa850a815982e8b" }
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
return {
|
||||
'mfussenegger/nvim-dap'
|
||||
}
|
||||
@ -4,6 +4,7 @@ return {
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim", -- required
|
||||
"sindrets/diffview.nvim", -- optional - Diff integration
|
||||
|
||||
-- Only one of these is needed.
|
||||
"nvim-telescope/telescope.nvim", -- optional
|
||||
"ibhagwan/fzf-lua", -- optional
|
||||
@ -20,74 +21,6 @@ return {
|
||||
|
||||
vim.keymap.set('n', '<leader>sh', gitsigns.stage_hunk, { noremap = true, silent = true })
|
||||
vim.keymap.set('n', '<leader>uh', gitsigns.undo_stage_hunk, { noremap = true, silent = true })
|
||||
|
||||
vim.keymap.set('n', '<leader>h', gitsigns.next_hunk, { noremap = true, silent = true })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"FabijanZulj/blame.nvim",
|
||||
lazy = false,
|
||||
colors = {
|
||||
"#b8cc52",
|
||||
"#36a3d9",
|
||||
"#e6e1cf",
|
||||
},
|
||||
config = function()
|
||||
require('blame').setup {
|
||||
format_fn = function (line_porcelain, config, idx)
|
||||
local utils = require("blame.utils")
|
||||
|
||||
local hash = string.sub(line_porcelain.hash, 0, 7)
|
||||
local line_with_hl = {}
|
||||
local is_commited = hash ~= "0000000"
|
||||
|
||||
if is_commited then
|
||||
local summary
|
||||
if #line_porcelain.summary > config.max_summary_width then
|
||||
summary = string.sub(
|
||||
line_porcelain.summary,
|
||||
0,
|
||||
config.max_summary_width - 3
|
||||
) .. "..."
|
||||
else
|
||||
summary = line_porcelain.summary
|
||||
end
|
||||
line_with_hl = {
|
||||
idx = idx,
|
||||
values = {
|
||||
{
|
||||
textValue = utils.format_time(
|
||||
config.date_format,
|
||||
line_porcelain.committer_time
|
||||
),
|
||||
hl = "Comment",
|
||||
},
|
||||
{
|
||||
textValue = line_porcelain.author .. ":",
|
||||
hl = hash,
|
||||
},
|
||||
{
|
||||
textValue = summary,
|
||||
hl = hash,
|
||||
},
|
||||
},
|
||||
format = "%s %s",
|
||||
}
|
||||
else
|
||||
line_with_hl = {
|
||||
idx = idx,
|
||||
values = {
|
||||
{
|
||||
textValue = "Not commited yet",
|
||||
hl = "Comment",
|
||||
},
|
||||
},
|
||||
format = "%s",
|
||||
}
|
||||
end
|
||||
return line_with_hl
|
||||
end
|
||||
}
|
||||
end,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@ -71,60 +71,13 @@ return {
|
||||
},
|
||||
},
|
||||
"bfredl/nvim-luadev",
|
||||
{
|
||||
"vimwiki/vimwiki",
|
||||
init = function ()
|
||||
vim.cmd[[
|
||||
let g:vimwiki_list = [{'path': '~/vimwiki/',
|
||||
\ 'syntax': 'markdown', 'ext': 'md'}]
|
||||
]]
|
||||
end
|
||||
},
|
||||
-- {
|
||||
-- 'MeanderingProgrammer/render-markdown.nvim',
|
||||
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
|
||||
-- ---@module 'render-markdown'
|
||||
-- ---@type render.md.UserConfig
|
||||
-- opts = {
|
||||
-- link = {
|
||||
-- enabled = true,
|
||||
-- render_modes = false,
|
||||
-- footnote = {
|
||||
-- enabled = true,
|
||||
-- superscript = true,
|
||||
-- prefix = '',
|
||||
-- suffix = '',
|
||||
-- },
|
||||
-- image = ' ',
|
||||
-- email = ' ',
|
||||
-- hyperlink = ' ',
|
||||
-- highlight = 'RenderMarkdownLink',
|
||||
-- },
|
||||
-- pipe_table = { cell = 'trimmed' },
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- "vimwiki/vimwiki",
|
||||
"mattn/calendar-vim",
|
||||
"Shougo/unite.vim",
|
||||
"powerman/vim-plugin-AnsiEsc",
|
||||
"preservim/tagbar",
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>?",
|
||||
function()
|
||||
require("which-key").show({ global = false })
|
||||
end,
|
||||
desc = "Buffer Local Keymaps (which-key)",
|
||||
},
|
||||
},
|
||||
},
|
||||
"liuchengxu/vim-which-key",
|
||||
{
|
||||
'windwp/nvim-autopairs',
|
||||
event = "InsertEnter",
|
||||
@ -148,13 +101,13 @@ return {
|
||||
"morhetz/gruvbox",
|
||||
"mhartington/oceanic-next",
|
||||
"kaicataldo/material.vim",
|
||||
{
|
||||
"ayu-theme/ayu-vim",
|
||||
config = function()
|
||||
vim.cmd([[let ayucolor="dark"]])
|
||||
vim.cmd([[colorscheme ayu]])
|
||||
end
|
||||
},
|
||||
"yuezk/vim-js",
|
||||
"maxmellon/vim-jsx-pretty",
|
||||
{
|
||||
"airblade/vim-gitgutter",
|
||||
config = function ()
|
||||
-- disable because I already have Gitsigns
|
||||
vim.cmd[[GitGutterBufferDisable]]
|
||||
end
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,7 +9,6 @@ local lsp_servers = {
|
||||
"marksman",
|
||||
"taplo",
|
||||
"yamlls",
|
||||
"clangd",
|
||||
}
|
||||
|
||||
return {
|
||||
@ -137,10 +136,6 @@ cmp.setup {
|
||||
}
|
||||
vim.keymap.set('n', "gd", vim.lsp.buf.definition, { silent = true })
|
||||
vim.keymap.set('n', "ca", vim.lsp.buf.code_action, { silent = true })
|
||||
vim.keymap.set('n', "<leader>ih", function ()
|
||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
|
||||
end, { silent = true })
|
||||
vim.keymap.set('n', "<leader>cf", vim.lsp.buf.format, { silent = true })
|
||||
|
||||
-- Show line diagnostics automatically in hover window
|
||||
vim.o.updatetime = 250
|
||||
|
||||
@ -53,68 +53,5 @@ return {
|
||||
vim.g.floaterm_giteditor = false
|
||||
vim.keymap.set('n', '<leader>cw', '<cmd>:FloatermNew git commit<cr>', { noremap = true, silent = true })
|
||||
end
|
||||
},
|
||||
{
|
||||
"folke/tokyonight.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {},
|
||||
init = function ()
|
||||
vim.cmd[[colorscheme tokyonight-night]]
|
||||
-- show column for character limit 80
|
||||
-- isn't directly related to colorscheme,
|
||||
-- but related to colorscheme colors
|
||||
vim.cmd[[hi ColorColumn ctermbg=lightgrey guibg=#20303b]]
|
||||
vim.cmd[[set colorcolumn=80]]
|
||||
end
|
||||
},
|
||||
{
|
||||
"folke/zen-mode.nvim",
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
window = {
|
||||
backdrop = 0.65,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/twilight.nvim",
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
}
|
||||
},
|
||||
-- {
|
||||
-- "ggandor/leap.nvim",
|
||||
-- opts = {},
|
||||
-- },
|
||||
-- {
|
||||
-- 'smoka7/hop.nvim',
|
||||
-- version = "*",
|
||||
-- opts = {
|
||||
-- keys = 'etovxqpdygfblzhckisuran'
|
||||
-- },
|
||||
-- init = function ()
|
||||
-- vim.keymap.set('n', 'f', require('hop').hint_words, { noremap = true, silent = true })
|
||||
-- end
|
||||
-- },
|
||||
{
|
||||
"folke/flash.nvim",
|
||||
event = "VeryLazy",
|
||||
---@type Flash.Config
|
||||
opts = {},
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
-- { "f", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
|
||||
-- { "F", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
|
||||
-- { "r", mode = "n", function() require("flash").remote() end, desc = "Remote Flash" },
|
||||
-- { "R", mode = { "n", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
|
||||
-- { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
|
||||
{ "r", mode = "n", function() require("flash").remote() end, desc = "Remote Flash" },
|
||||
{ "R", mode = { "n", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user