From 581161ac342b58e75ed851259cab0c57b7b0e2c5 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Wed, 28 Feb 2024 10:49:26 +0100 Subject: Provide two helix presets, one for "helix" and one for "hx" The helix binary seems to be called "helix" on some distributions (e.g. Arch), but "hx" on others (e.g. Fedora). Provide presets for both, so that auto-detection from $EDITOR works. --- pkg/config/editor_presets.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkg/config/editor_presets.go b/pkg/config/editor_presets.go index 284b21306..a718e6e17 100644 --- a/pkg/config/editor_presets.go +++ b/pkg/config/editor_presets.go @@ -65,6 +65,13 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset "nano": standardTerminalEditorPreset("nano"), "kakoune": standardTerminalEditorPreset("kak"), "helix": { + editTemplate: "helix -- {{filename}}", + editAtLineTemplate: "helix -- {{filename}}:{{line}}", + editAtLineAndWaitTemplate: "helix -- {{filename}}:{{line}}", + openDirInEditorTemplate: "helix -- {{dir}}", + suspend: true, + }, + "helix (hx)": { editTemplate: "hx -- {{filename}}", editAtLineTemplate: "hx -- {{filename}}:{{line}}", editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}", @@ -103,11 +110,12 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset // Some of our presets have a different name than the editor they are using. editorToPreset := map[string]string{ - "kak": "kakoune", - "hx": "helix", - "code": "vscode", - "subl": "sublime", - "xed": "xcode", + "kak": "kakoune", + "helix": "helix", + "hx": "helix (hx)", + "code": "vscode", + "subl": "sublime", + "xed": "xcode", } presetName := osConfig.EditPreset -- cgit v1.2.3