signify cmds

config/.config/nvim/lazy-lock.json

@@ -58,22 +58,13 @@
   "mellifluous.nvim": { "branch": "main", "commit": "b0e7d7753331c181633dbaf11b23633c0f72341d" },
   "mini.splitjoin": { "branch": "main", "commit": "2b4ade24c1d46ce98801b74fc84241d7b676f9f4" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
-  "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "483019d251c31acd14102bc279f938f98d9a3de6" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
   "neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" },
   "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
-<<<<<<< HEAD
   "neovim-ayu": { "branch": "master", "commit": "76dbf939b38e03ac5f9bd711ab3e434999f715c8" },
   "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" },
-<<<<<<< HEAD
-  "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
-=======
-  "nui.nvim": { "branch": "main", "commit": "257dccc43b4badc735978f0791d216f7d665b75a" },
->>>>>>> 4c8f5e4 (personal themes)
-=======
   "nui.nvim": { "branch": "main", "commit": "257dccc43b4badc735978f0791d216f7d665b75a" },
   "nvgoog": { "branch": "main", "commit": "6812863edf5b1f921d6821bee7ec3221cd56606c" },
->>>>>>> 7da9665 (signify keymaps)
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
   "nvim-dap": { "branch": "master", "commit": "13ce59d4852be2bb3cd4967947985cb0ceaff460" },
@@ -86,27 +77,16 @@
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
   "nvim-surround": { "branch": "main", "commit": "18016d6af52edc9f1c794dcf6665a26a2962d2ee" },
-<<<<<<< HEAD
-<<<<<<< HEAD
-  "nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" },
-=======
-  "nvim-treesitter": { "branch": "master", "commit": "b056e4227b1c5d3ecfe96941352364c0c10668df" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
-  "nvim-web-devicons": { "branch": "master", "commit": "7b1c4a8743e71627beb4e00d0a225247ab6eb2f7" },
->>>>>>> 4c8f5e4 (personal themes)
-=======
   "nvim-treesitter": { "branch": "master", "commit": "80a16deb5146a3eb4648effccda1ab9f45e43e76" },
   "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
   "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
->>>>>>> 7da9665 (signify keymaps)
   "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" },
   "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
   "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" },
   "registers.nvim": { "branch": "main", "commit": "7a16c6e6fe96f3c9c8bb55b95047d745dd34ca4d" },
   "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
+  "scope.nvim": { "branch": "main", "commit": "cd27af77ad61a7199af5c28d27013fb956eb0e3e" },
   "scss-syntax.vim": { "branch": "master", "commit": "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef" },
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },

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 = "*",

vim/.vim/lua/plugins/lualine.lua

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

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",

vim/.vim/lua/plugins/signify.lua

@@ -1,6 +1,6 @@
 local use_google = require("utils").use_google
 
-local function setup_mercurial(hg_cmd)
+local function setup_mercurial(hg_args)
 	local git_cmd = "git diff --no-color --no-ext-diff -U0 -- %f"
 	local rcs_cmd = "rcsdiff -U0 %f 2>%n"
 	local svn_cmd = "svn diff --diff-cmd %d -x -U0 -- %f"
@@ -8,30 +8,39 @@ local function setup_mercurial(hg_cmd)
 		[[
 let g:signify_vcs_cmds = {
       \ 'git':      '%s',
-      \ 'hg':       '%s',
       \ 'rcs':      '%s',
       \ 'svn':      '%s',
+      \ 'hg':       'hg diff %s',
+      \ }
+let g:signify_vcs_cmds_diffmode = {
+      \ 'hg':       'hg cat %s',
       \ }
   ]],
 		git_cmd,
-		hg_cmd,
 		rcs_cmd,
-		svn_cmd
+		svn_cmd,
+		hg_args,
+		hg_args
 	))
 end
 
 _G.signify_dtup = function()
-	setup_mercurial('hg diff -r ".^" %f')
+	setup_mercurial('-r ".^" %f')
+	vim.cmd([[:SignifyRefresh]])
+end
+
+_G.signify_normal = function()
+	setup_mercurial("--color=never config aliases.diff= --nodates -U0 -- %f")
 	vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtp4 = function()
-	setup_mercurial('hg diff -r "p4base" %f')
+	setup_mercurial('-r "p4base" %f')
 	vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtex = function()
-	setup_mercurial('hg diff -r "exported(.)" %f')
+	setup_mercurial('-r "exported(.)" %f')
 	vim.cmd([[:SignifyRefresh]])
 end
 
@@ -42,6 +51,7 @@ return {
 		{ "]d", "<plug>(signify-next-hunk)" },
 		{ "[d", "<plug>(signify-prev-hunk)" },
 		{ "<leader>sd", ":SignifyDiff<CR>" },
+		{ "<leader>sn", ":lua signify_normal()<CR>" },
 		{ "<leader>sup", ":lua signify_dtup()<CR>" },
 		{ "<leader>sex", ":lua signify_dtex()<CR>" },
 		{ "<leader>sp4", ":lua signify_dtp4()<CR>" },