signify stuff

This commit is contained in:
Christian Nieves
2023-12-07 00:22:37 +00:00
parent afd1089deb
commit 448ea9f81f
4 changed files with 36 additions and 31 deletions

View File

@ -1,15 +1,15 @@
return { return {
-- { {
-- "tiagovla/scope.nvim", "tiagovla/scope.nvim",
-- config = function() config = function()
-- -- vim.opt.sessionoptions = { -- required -- vim.opt.sessionoptions = { -- required
-- -- "buffers", -- "buffers",
-- -- "tabpages", -- "tabpages",
-- -- "globals", -- "globals",
-- -- } -- }
-- require("scope").setup({}) require("scope").setup({})
-- end, end,
-- }, },
{ {
"akinsho/bufferline.nvim", "akinsho/bufferline.nvim",
version = "*", version = "*",

View File

@ -69,7 +69,6 @@ return {
}, },
lualine_x = { lualine_x = {
"", "",
"aerial",
{ {
"diagnostics", "diagnostics",
sources = { "nvim_lsp" }, sources = { "nvim_lsp" },

View File

@ -1,24 +1,24 @@
return { return {
"PrestonKnopp/tree-sitter-gdscript", "PrestonKnopp/tree-sitter-gdscript",
{ -- {
"nvim-treesitter/nvim-treesitter-context", -- "nvim-treesitter/nvim-treesitter-context",
config = function() -- config = function()
require("treesitter-context").setup({ -- require("treesitter-context").setup({
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands) -- 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. -- 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. -- min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
line_numbers = true, -- line_numbers = true,
multiline_threshold = 7, -- Maximum number of lines to show for a single context -- 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' -- 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' -- mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline'
-- Separator between context and content. Should be a single character string, like '-'. -- -- 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. -- -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
separator = nil, -- separator = nil,
zindex = 20, -- The Z-index of the context window -- zindex = 20, -- The Z-index of the context window
on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching -- on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
}) -- })
end, -- end,
}, -- },
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
build = ":TSUpdate", build = ":TSUpdate",

View File

@ -25,6 +25,11 @@ _G.signify_dtup = function()
vim.cmd([[:SignifyRefresh]]) vim.cmd([[:SignifyRefresh]])
end 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() _G.signify_dtp4 = function()
setup_mercurial('hg diff -r "p4base" %f') setup_mercurial('hg diff -r "p4base" %f')
vim.cmd([[:SignifyRefresh]]) vim.cmd([[:SignifyRefresh]])
@ -42,6 +47,7 @@ return {
{ "]d", "<plug>(signify-next-hunk)" }, { "]d", "<plug>(signify-next-hunk)" },
{ "[d", "<plug>(signify-prev-hunk)" }, { "[d", "<plug>(signify-prev-hunk)" },
{ "<leader>sd", ":SignifyDiff<CR>" }, { "<leader>sd", ":SignifyDiff<CR>" },
{ "<leader>sn", ":lua signify_normal()<CR>" },
{ "<leader>sup", ":lua signify_dtup()<CR>" }, { "<leader>sup", ":lua signify_dtup()<CR>" },
{ "<leader>sex", ":lua signify_dtex()<CR>" }, { "<leader>sex", ":lua signify_dtex()<CR>" },
{ "<leader>sp4", ":lua signify_dtp4()<CR>" }, { "<leader>sp4", ":lua signify_dtp4()<CR>" },