diff --git a/vim/.vim/lua/plugins/bufferline.lua b/vim/.vim/lua/plugins/bufferline.lua index 53c306d..b84a651 100644 --- a/vim/.vim/lua/plugins/bufferline.lua +++ b/vim/.vim/lua/plugins/bufferline.lua @@ -1,15 +1,15 @@ return { - -- { - -- "tiagovla/scope.nvim", - -- config = function() - -- -- vim.opt.sessionoptions = { -- required - -- -- "buffers", - -- -- "tabpages", - -- -- "globals", - -- -- } - -- require("scope").setup({}) - -- end, - -- }, + { + "tiagovla/scope.nvim", + config = function() + -- vim.opt.sessionoptions = { -- required + -- "buffers", + -- "tabpages", + -- "globals", + -- } + require("scope").setup({}) + end, + }, { "akinsho/bufferline.nvim", version = "*", diff --git a/vim/.vim/lua/plugins/lualine.lua b/vim/.vim/lua/plugins/lualine.lua index 6754de6..3d87958 100644 --- a/vim/.vim/lua/plugins/lualine.lua +++ b/vim/.vim/lua/plugins/lualine.lua @@ -69,7 +69,6 @@ return { }, lualine_x = { "", - "aerial", { "diagnostics", sources = { "nvim_lsp" }, diff --git a/vim/.vim/lua/plugins/nvim-treesitter.lua b/vim/.vim/lua/plugins/nvim-treesitter.lua index 80018f1..83c9032 100644 --- a/vim/.vim/lua/plugins/nvim-treesitter.lua +++ b/vim/.vim/lua/plugins/nvim-treesitter.lua @@ -1,24 +1,24 @@ return { "PrestonKnopp/tree-sitter-gdscript", - { - "nvim-treesitter/nvim-treesitter-context", - config = function() - require("treesitter-context").setup({ - enable = true, -- Enable this plugin (Can be enabled/disabled later via commands) - max_lines = 7, -- How many lines the window should span. Values <= 0 mean no limit. - min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit. - line_numbers = true, - multiline_threshold = 7, -- Maximum number of lines to show for a single context - trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer' - mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline' - -- Separator between context and content. Should be a single character string, like '-'. - -- When separator is set, the context will only show up when there are at least 2 lines above cursorline. - separator = nil, - zindex = 20, -- The Z-index of the context window - on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching - }) - end, - }, + -- { + -- "nvim-treesitter/nvim-treesitter-context", + -- config = function() + -- require("treesitter-context").setup({ + -- enable = true, -- Enable this plugin (Can be enabled/disabled later via commands) + -- max_lines = 7, -- How many lines the window should span. Values <= 0 mean no limit. + -- min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit. + -- line_numbers = true, + -- multiline_threshold = 7, -- Maximum number of lines to show for a single context + -- trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer' + -- mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline' + -- -- Separator between context and content. Should be a single character string, like '-'. + -- -- When separator is set, the context will only show up when there are at least 2 lines above cursorline. + -- separator = nil, + -- zindex = 20, -- The Z-index of the context window + -- on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching + -- }) + -- end, + -- }, { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", diff --git a/vim/.vim/lua/plugins/signify.lua b/vim/.vim/lua/plugins/signify.lua index feab0cc..ea7b7ab 100644 --- a/vim/.vim/lua/plugins/signify.lua +++ b/vim/.vim/lua/plugins/signify.lua @@ -25,6 +25,11 @@ _G.signify_dtup = function() vim.cmd([[:SignifyRefresh]]) end +_G.signify_normal = function() + setup_mercurial("hg diff --color=never config aliases.diff= --nodates -U0 -- %f") + vim.cmd([[:SignifyRefresh]]) +end + _G.signify_dtp4 = function() setup_mercurial('hg diff -r "p4base" %f') vim.cmd([[:SignifyRefresh]]) @@ -42,6 +47,7 @@ return { { "]d", "(signify-next-hunk)" }, { "[d", "(signify-prev-hunk)" }, { "sd", ":SignifyDiff" }, + { "sn", ":lua signify_normal()" }, { "sup", ":lua signify_dtup()" }, { "sex", ":lua signify_dtex()" }, { "sp4", ":lua signify_dtp4()" },