diff --git a/google/.hgrc b/google/.hgrc index 23cd439..954847d 100644 --- a/google/.hgrc +++ b/google/.hgrc @@ -16,15 +16,15 @@ opts.vimdiff = -d # opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))' [extensions] -unsupported.tree = -unsupported.alices = +# unsupported.tree = +# unsupported.alices = extdiff = -color = +# color = beautifygraph = -[alices] -findings.extra_args = --proxy -summarize.extra_args = --proxy +# [alices] +# findings.extra_args = --proxy +# summarize.extra_args = --proxy [merge-tools] vimdiff.executable = nvim @@ -51,6 +51,7 @@ dt = icdiff --pager=on dtex = dt -r exported(.) dtp4 = dt -r p4base dtup = dt -r .^ +ra = revert --all whatsout = status -n --change . --template=hgshort_status what = status -n --change . --template=hgshort_status diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua index 6e4753d..a0e23c4 100644 --- a/vim/.vim/lua/plugins/base.lua +++ b/vim/.vim/lua/plugins/base.lua @@ -1,146 +1,142 @@ local use_google = require("utils").use_google return { - "tikhomirov/vim-glsl", - "sindrets/diffview.nvim", - { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } }, - { - "MagicDuck/grug-far.nvim", - config = function() - require("grug-far").setup({ - -- search and replace engines configuration - engines = { - -- see https://github.com/BurntSushi/ripgrep - ripgrep = { - -- ripgrep executable to use, can be a different path if you need to configure - path = "rg", - -- extraArgs = "-.", - }, - }, - }) - end, - }, - { - "shellRaining/hlchunk.nvim", - event = { "BufReadPre", "BufNewFile" }, - opts = { - line_num = { enable = true }, - chunk = { - enable = true, - priority = 15, - style = { - { fg = "#393d4c" }, - }, - chars = { - horizontal_line = "─", - -- vertical_line = "│", - vertical_line = "┊", - left_top = "╭", - left_bottom = "╰", - right_arrow = ">", - }, - use_treesitter = true, - textobject = "", - max_file_size = 1024 * 1024, - error_sign = true, - -- animation related - duration = 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 = { - { "tc", "TextCaseOpenTelescope", mode = { "n", "v" }, desc = "Telescope" }, + "tikhomirov/vim-glsl", + "sindrets/diffview.nvim", + { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } }, + { + "MagicDuck/grug-far.nvim", + config = function() + require("grug-far").setup({ + -- search and replace engines configuration + engines = { + -- see https://github.com/BurntSushi/ripgrep + ripgrep = { + -- ripgrep executable to use, can be a different path if you need to configure + path = "rg", + -- extraArgs = "-.", + }, + }, + }) + end, + }, + { + "shellRaining/hlchunk.nvim", + event = { "BufReadPre", "BufNewFile" }, + opts = { + line_num = { enable = true }, + chunk = { + enable = true, + priority = 15, + style = { + { fg = "#393d4c" }, + }, + chars = { + horizontal_line = "─", + -- vertical_line = "│", + vertical_line = "┊", + left_top = "╭", + left_bottom = "╰", + right_arrow = ">", + }, + use_treesitter = true, + textobject = "", + max_file_size = 1024 * 1024, + error_sign = true, + -- animation related + duration = 0, + delay = 0, + }, }, - }, - { - "NvChad/nvim-colorizer.lua", - ft = "lua", - config = function() - require("colorizer").setup() - end, - }, - { + }, + "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", + }, + }, + { + "NvChad/nvim-colorizer.lua", + ft = "lua", + config = function() + require("colorizer").setup() + end, + }, + { - "andweeb/presence.nvim", - cond = not use_google(), - config = function() - require("presence").setup({ - main_image = "file", - show_time = false, - }) - end, - }, - { - "ntpeters/vim-better-whitespace", - config = function() - vim.g.better_whitespace_filetypes_blacklist = { "dashboard" } - end, - }, - { - "mbbill/undotree", - cmd = "UndotreeToggle", - config = function() - vim.g.undotree_SetFocusWhenToggle = 1 - end, + "andweeb/presence.nvim", + cond = not use_google(), + config = function() + require("presence").setup({ + main_image = "file", + show_time = false, + }) + end, + }, + { + "ntpeters/vim-better-whitespace", + config = function() + vim.g.better_whitespace_filetypes_blacklist = { "dashboard" } + end, + }, + { + "mbbill/undotree", + cmd = "UndotreeToggle", + config = function() + vim.g.undotree_SetFocusWhenToggle = 1 + end, -- stylua: ignore keys = { { "ut", ":UndotreeToggle" } }, - }, - { - "stevearc/aerial.nvim", - opts = {}, - cmd = { "AerialToggle", "AerialOn" }, + }, + { + "stevearc/aerial.nvim", + opts = {}, + cmd = { "AerialToggle", "AerialOn" }, -- stylua: ignore keys = { { "so", ":AerialToggle", desc = "[S]symbols [O]utline" } }, - }, - { - "andrewferrier/debugprint.nvim", - opts = {}, - -- Dependency only needed for NeoVim 0.8 - dependencies = { - "nvim-treesitter/nvim-treesitter", - }, - -- Remove the following line to use development versions, - -- not just the formal releases - version = "*", + }, + { + "andrewferrier/debugprint.nvim", + opts = {}, + -- Dependency only needed for NeoVim 0.8 + dependencies = { + "nvim-treesitter/nvim-treesitter", + }, + -- Remove the following line to use development versions, + -- not just the formal releases + version = "*", -- stylua: ignore keys = { { "dp", ":lua require('debugprint').debugprint()", desc = "Debug print" }, @@ -148,5 +144,5 @@ return { { "dq", ":lua require('debugprint').debugprint({variable = true})", desc = "Debug print" }, { "dQ", ":lua require('debugprint').debugprint({variable = true, above = true})", desc = "Debug print", }, }, - }, + }, }