Compare commits
2 Commits
e242d6eb56
...
d56eb258cd
Author | SHA1 | Date | |
---|---|---|---|
d56eb258cd | |||
a1880dcdad |
@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }
|
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }
|
||||||
}
|
}
|
||||||
|
13
google/.hgrc
13
google/.hgrc
@ -16,15 +16,15 @@ opts.vimdiff = -d
|
|||||||
# opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))'
|
# opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))'
|
||||||
|
|
||||||
[extensions]
|
[extensions]
|
||||||
unsupported.tree =
|
# unsupported.tree =
|
||||||
unsupported.alices =
|
# unsupported.alices =
|
||||||
extdiff =
|
extdiff =
|
||||||
color =
|
# color =
|
||||||
beautifygraph =
|
beautifygraph =
|
||||||
|
|
||||||
[alices]
|
# [alices]
|
||||||
findings.extra_args = --proxy
|
# findings.extra_args = --proxy
|
||||||
summarize.extra_args = --proxy
|
# summarize.extra_args = --proxy
|
||||||
|
|
||||||
[merge-tools]
|
[merge-tools]
|
||||||
vimdiff.executable = nvim
|
vimdiff.executable = nvim
|
||||||
@ -51,6 +51,7 @@ dt = icdiff --pager=on
|
|||||||
dtex = dt -r exported(.)
|
dtex = dt -r exported(.)
|
||||||
dtp4 = dt -r p4base
|
dtp4 = dt -r p4base
|
||||||
dtup = dt -r .^
|
dtup = dt -r .^
|
||||||
|
ra = revert --all
|
||||||
|
|
||||||
whatsout = status -n --change . --template=hgshort_status
|
whatsout = status -n --change . --template=hgshort_status
|
||||||
what = status -n --change . --template=hgshort_status
|
what = status -n --change . --template=hgshort_status
|
||||||
|
@ -1,146 +1,142 @@
|
|||||||
local use_google = require("utils").use_google
|
local use_google = require("utils").use_google
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"tikhomirov/vim-glsl",
|
"tikhomirov/vim-glsl",
|
||||||
"sindrets/diffview.nvim",
|
"sindrets/diffview.nvim",
|
||||||
{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
|
{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
|
||||||
{
|
{
|
||||||
"MagicDuck/grug-far.nvim",
|
"MagicDuck/grug-far.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("grug-far").setup({
|
require("grug-far").setup({
|
||||||
-- search and replace engines configuration
|
-- search and replace engines configuration
|
||||||
engines = {
|
engines = {
|
||||||
-- see https://github.com/BurntSushi/ripgrep
|
-- see https://github.com/BurntSushi/ripgrep
|
||||||
ripgrep = {
|
ripgrep = {
|
||||||
-- ripgrep executable to use, can be a different path if you need to configure
|
-- ripgrep executable to use, can be a different path if you need to configure
|
||||||
path = "rg",
|
path = "rg",
|
||||||
-- extraArgs = "-.",
|
-- extraArgs = "-.",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"shellRaining/hlchunk.nvim",
|
"shellRaining/hlchunk.nvim",
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
opts = {
|
opts = {
|
||||||
line_num = { enable = true },
|
line_num = { enable = true },
|
||||||
chunk = {
|
chunk = {
|
||||||
enable = true,
|
enable = true,
|
||||||
priority = 15,
|
priority = 15,
|
||||||
style = {
|
style = {
|
||||||
{ fg = "#393d4c" },
|
{ fg = "#393d4c" },
|
||||||
},
|
},
|
||||||
chars = {
|
chars = {
|
||||||
horizontal_line = "─",
|
horizontal_line = "─",
|
||||||
-- vertical_line = "│",
|
-- vertical_line = "│",
|
||||||
vertical_line = "┊",
|
vertical_line = "┊",
|
||||||
left_top = "╭",
|
left_top = "╭",
|
||||||
left_bottom = "╰",
|
left_bottom = "╰",
|
||||||
right_arrow = ">",
|
right_arrow = ">",
|
||||||
},
|
},
|
||||||
use_treesitter = true,
|
use_treesitter = true,
|
||||||
textobject = "",
|
textobject = "",
|
||||||
max_file_size = 1024 * 1024,
|
max_file_size = 1024 * 1024,
|
||||||
error_sign = true,
|
error_sign = true,
|
||||||
-- animation related
|
-- animation related
|
||||||
duration = 0,
|
duration = 0,
|
||||||
delay = 0,
|
delay = 0,
|
||||||
},
|
},
|
||||||
},
|
|
||||||
},
|
|
||||||
"RRethy/vim-illuminate",
|
|
||||||
"kdheepak/lazygit.nvim",
|
|
||||||
"flwyd/vim-conjoin",
|
|
||||||
"rafcamlet/nvim-luapad",
|
|
||||||
"vim-scripts/vcscommand.vim",
|
|
||||||
"AndrewRadev/tagalong.vim",
|
|
||||||
"AndrewRadev/yankwin.vim",
|
|
||||||
{ "squk/gdrama-syntax.vim", ft = "gdrama" },
|
|
||||||
{ "nvim-lua/plenary.nvim", lazy = false },
|
|
||||||
{ "squk/java-syntax.vim", ft = "java" },
|
|
||||||
{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
|
|
||||||
{ "andymass/vim-matchup", event = "VimEnter" },
|
|
||||||
{ "jghauser/mkdir.nvim", event = "BufWritePre" },
|
|
||||||
{
|
|
||||||
"rmagatti/auto-session",
|
|
||||||
dependencies = {
|
|
||||||
"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
require("auto-session").setup({
|
|
||||||
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
|
|
||||||
args_allow_single_directory = false,
|
|
||||||
bypass_save_filetypes = { "netrw" },
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
"tpope/vim-abolish",
|
|
||||||
{
|
|
||||||
"johmsalas/text-case.nvim",
|
|
||||||
dependencies = { "nvim-telescope/telescope.nvim" },
|
|
||||||
config = function()
|
|
||||||
require("textcase").setup({})
|
|
||||||
require("telescope").load_extension("textcase")
|
|
||||||
end,
|
|
||||||
cmd = {
|
|
||||||
"Subs",
|
|
||||||
},
|
|
||||||
-- stylua: ignore
|
|
||||||
keys = {
|
|
||||||
{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
"RRethy/vim-illuminate",
|
||||||
"NvChad/nvim-colorizer.lua",
|
"kdheepak/lazygit.nvim",
|
||||||
ft = "lua",
|
"flwyd/vim-conjoin",
|
||||||
config = function()
|
"rafcamlet/nvim-luapad",
|
||||||
require("colorizer").setup()
|
"vim-scripts/vcscommand.vim",
|
||||||
end,
|
"AndrewRadev/tagalong.vim",
|
||||||
},
|
"AndrewRadev/yankwin.vim",
|
||||||
{
|
{ "squk/gdrama-syntax.vim", ft = "gdrama" },
|
||||||
|
{ "nvim-lua/plenary.nvim", lazy = false },
|
||||||
|
{ "squk/java-syntax.vim", ft = "java" },
|
||||||
|
{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
|
||||||
|
{ "andymass/vim-matchup", event = "VimEnter" },
|
||||||
|
{ "jghauser/mkdir.nvim", event = "BufWritePre" },
|
||||||
|
{
|
||||||
|
"rmagatti/auto-session",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("auto-session").setup({
|
||||||
|
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
|
||||||
|
args_allow_single_directory = false,
|
||||||
|
bypass_save_filetypes = { "netrw" },
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
"tpope/vim-abolish",
|
||||||
|
{
|
||||||
|
"johmsalas/text-case.nvim",
|
||||||
|
dependencies = { "nvim-telescope/telescope.nvim" },
|
||||||
|
config = function()
|
||||||
|
require("textcase").setup({})
|
||||||
|
require("telescope").load_extension("textcase")
|
||||||
|
end,
|
||||||
|
cmd = {
|
||||||
|
"Subs",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"NvChad/nvim-colorizer.lua",
|
||||||
|
ft = "lua",
|
||||||
|
config = function()
|
||||||
|
require("colorizer").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
|
||||||
"andweeb/presence.nvim",
|
"andweeb/presence.nvim",
|
||||||
cond = not use_google(),
|
cond = not use_google(),
|
||||||
config = function()
|
config = function()
|
||||||
require("presence").setup({
|
require("presence").setup({
|
||||||
main_image = "file",
|
main_image = "file",
|
||||||
show_time = false,
|
show_time = false,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ntpeters/vim-better-whitespace",
|
"ntpeters/vim-better-whitespace",
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
|
vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"mbbill/undotree",
|
"mbbill/undotree",
|
||||||
cmd = "UndotreeToggle",
|
cmd = "UndotreeToggle",
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.undotree_SetFocusWhenToggle = 1
|
vim.g.undotree_SetFocusWhenToggle = 1
|
||||||
end,
|
end,
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
|
keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"stevearc/aerial.nvim",
|
"stevearc/aerial.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
cmd = { "AerialToggle", "AerialOn" },
|
cmd = { "AerialToggle", "AerialOn" },
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
|
keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"andrewferrier/debugprint.nvim",
|
"andrewferrier/debugprint.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
-- Dependency only needed for NeoVim 0.8
|
-- Dependency only needed for NeoVim 0.8
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
},
|
},
|
||||||
-- Remove the following line to use development versions,
|
-- Remove the following line to use development versions,
|
||||||
-- not just the formal releases
|
-- not just the formal releases
|
||||||
version = "*",
|
version = "*",
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
|
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
|
||||||
@ -148,5 +144,5 @@ return {
|
|||||||
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
|
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
|
||||||
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
|
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -2,17 +2,6 @@ local use_google = require("utils").use_google
|
|||||||
local flags = require("utils").flags
|
local flags = require("utils").flags
|
||||||
|
|
||||||
return {
|
return {
|
||||||
-- {
|
|
||||||
-- "ray-x/lsp_signature.nvim",
|
|
||||||
-- event = "VeryLazy",
|
|
||||||
-- opts = {
|
|
||||||
-- floating_window = true,
|
|
||||||
-- hint_prefix = " ",
|
|
||||||
-- },
|
|
||||||
-- config = function(_, opts)
|
|
||||||
-- require("lsp_signature").setup(opts)
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
{
|
{
|
||||||
"kosayoda/nvim-lightbulb",
|
"kosayoda/nvim-lightbulb",
|
||||||
commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
|
commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
|
||||||
|
Reference in New Issue
Block a user