diff --git a/git/config b/git/config index 514dfc4..2b33e39 100644 --- a/git/config +++ b/git/config @@ -51,7 +51,7 @@ date = iso [merge] conflictStyle = zdiff3 ff = only -tool = meld +tool = nvimdiff [pager] difftool = true diff --git a/helix/config.toml b/helix/config.toml index 7ae9c7e..95f4f02 100644 --- a/helix/config.toml +++ b/helix/config.toml @@ -87,12 +87,10 @@ 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" @@ -100,25 +98,29 @@ tabpad = "‒" "y" = "yank_to_clipboard" "j" = "yank_joined" "J" = "yank_joined_to_clipboard" -"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{+}"] +"d" = ":yank-diagnostic" [keys.select.space.y] "y" = "yank_to_clipboard" "j" = "yank_joined" "J" = "yank_joined_to_clipboard" -"D" = ":yank-diagnostic" +"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] "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.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;"