From ffc92a667194f930f35405d534f984956de17b8d Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Sat, 17 Oct 2026 14:06:13 -0400 Subject: [PATCH 1/4] git: Use meld for merge conflicts --- git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/config b/git/config index 2b33e39..514dfc4 100644 --- a/git/config +++ b/git/config @@ -51,7 +51,7 @@ date = iso [merge] conflictStyle = zdiff3 ff = only -tool = nvimdiff +tool = meld [pager] difftool = true From 24d4071edf7a8359bd7fe87a0d4b1a516d113f70 Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Sat, 17 Oct 2026 14:07:46 -0400 Subject: [PATCH 2/4] helix: Quote selection in shell bindings --- helix/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helix/config.toml b/helix/config.toml index 95f4f02..bac5429 100644 --- a/helix/config.toml +++ b/helix/config.toml @@ -117,10 +117,10 @@ tabpad = "‒" "b" = [":set-register + %sh{basename '%{buffer_name}'}", ":echo %reg{+}"] [keys.normal.space] -"*" = [":set-register / %sh{coil fuzzy %{selection}}", "global_search"] +"*" = [":set-register / %sh{coil fuzzy '%{selection}'}", "global_search"] [keys.select.space] -"*" = [":set-register / %sh{coil fuzzy %{selection}}", "global_search"] +"*" = [":set-register / %sh{coil fuzzy '%{selection}'}", "global_search"] [keys.normal."["] "F" = "@maf;" From 94f0a86dfb84d7769fbb2e673bd19189c3f78a7a Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Sat, 17 Oct 2026 14:11:12 -0400 Subject: [PATCH 3/4] helix: Add toggle for inlay hints --- helix/config.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helix/config.toml b/helix/config.toml index bac5429..d4686df 100644 --- a/helix/config.toml +++ b/helix/config.toml @@ -87,10 +87,12 @@ tabpad = "‒" "q" = ":reflow" [keys.normal.space.t] +"i" = ":toggle lsp.display-inlay-hints" "w" = ":toggle whitespace.render all none" "W" = ":toggle soft-wrap.enable" [keys.select.space.t] +"i" = ":toggle lsp.display-inlay-hints" "w" = ":toggle whitespace.render all none" "W" = ":toggle soft-wrap.enable" From 514fcdf589943f3e4cf0e937e86c26c4552f4853 Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Sat, 17 Oct 2026 14:11:31 -0400 Subject: [PATCH 4/4] helix: Merge space.Y into space.y --- helix/config.toml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/helix/config.toml b/helix/config.toml index d4686df..7ae9c7e 100644 --- a/helix/config.toml +++ b/helix/config.toml @@ -100,20 +100,16 @@ tabpad = "‒" "y" = "yank_to_clipboard" "j" = "yank_joined" "J" = "yank_joined_to_clipboard" -"d" = ":yank-diagnostic" +"D" = ":yank-diagnostic" +"p" = [":set-register + %sh{echo '%{buffer_name}'}", ":echo %reg{+}"] +"d" = [":set-register + %sh{dirname '%{buffer_name}'}", ":echo %reg{+}"] +"b" = [":set-register + %sh{basename '%{buffer_name}'}", ":echo %reg{+}"] [keys.select.space.y] "y" = "yank_to_clipboard" "j" = "yank_joined" "J" = "yank_joined_to_clipboard" -"d" = ":yank-diagnostic" - -[keys.normal.space.Y] -"p" = [":set-register + %sh{echo '%{buffer_name}'}", ":echo %reg{+}"] -"d" = [":set-register + %sh{dirname '%{buffer_name}'}", ":echo %reg{+}"] -"b" = [":set-register + %sh{basename '%{buffer_name}'}", ":echo %reg{+}"] - -[keys.select.space.Y] +"D" = ":yank-diagnostic" "p" = [":set-register + %sh{echo '%{buffer_name}'}", ":echo %reg{+}"] "d" = [":set-register + %sh{dirname '%{buffer_name}'}", ":echo %reg{+}"] "b" = [":set-register + %sh{basename '%{buffer_name}'}", ":echo %reg{+}"]