diff --git a/docs/Config.md b/docs/Config.md index d27050da0..7ffeca39f 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -715,7 +715,7 @@ os: editPreset: 'vscode' ``` -Supported presets are `vim`, `nvim`, `nvim-remote`, `lvim`, `emacs`, `nano`, `micro`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, `xcode`, and `zed`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR. +Supported presets are `vim`, `nvim`, `nvim-remote`, `lvim`, `emacs`, `nano`, `micro`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, `xcode`, `zed` and `acme`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR. `nvim-remote` is an experimental preset for when you have invoked lazygit from within a neovim process, allowing lazygit to open the file from within the parent process rather than spawning a new one. diff --git a/pkg/config/editor_presets.go b/pkg/config/editor_presets.go index 93fa8f900..3e3d82cb4 100644 --- a/pkg/config/editor_presets.go +++ b/pkg/config/editor_presets.go @@ -126,6 +126,13 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset openDirInEditorTemplate: "zed -- {{dir}}", suspend: returnBool(false), }, + "acme": { + editTemplate: "B {{filename}}", + editAtLineTemplate: "B {{filename}}:{{line}}", + editAtLineAndWaitTemplate: "E {{filename}}:{{line}}", + openDirInEditorTemplate: "B {{dir}}", + suspend: returnBool(false), + }, } // Some of our presets have a different name than the editor they are using. diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 77c7d4ead..30aad5c97 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -566,7 +566,7 @@ type OSConfig struct { // A built-in preset that sets all of the above settings. Supported presets // are defined in the getPreset function in editor_presets.go. - EditPreset string `yaml:"editPreset,omitempty" jsonschema:"example=vim,example=nvim,example=emacs,example=nano,example=vscode,example=sublime,example=kakoune,example=helix,example=xcode,example=zed"` + EditPreset string `yaml:"editPreset,omitempty" jsonschema:"example=vim,example=nvim,example=emacs,example=nano,example=vscode,example=sublime,example=kakoune,example=helix,example=xcode,example=zed,example=acme"` // Command for opening a file, as if the file is double-clicked. Should // contain "{{filename}}", but doesn't support "{{line}}". diff --git a/schema/config.json b/schema/config.json index 3a896b9b5..fa61f920b 100644 --- a/schema/config.json +++ b/schema/config.json @@ -1494,7 +1494,8 @@ "kakoune", "helix", "xcode", - "zed" + "zed", + "acme" ] }, "open": {