fix(config): move navigate-closed to core

Author: versenilvis

README.md

@@ -302,6 +302,7 @@ auto-execute = false           # run suggestion immediately instead of inserting
 atuin-history = 0              # 0 = shell history, 1 = atuin, 2 = both
 atuin-db-path = ""             # path to atuin's history.db, empty = use default
 cobra-probe-enabled = true     # fall back to probing cobra binaries for completions
+navigate-closed = "history"    # menu closed: "history" browses iris history, "shell" hands the key to the shell (atuin)
 
 [ui]
 style = "modern"       # "modern" or "classic"
@@ -319,7 +320,6 @@ select = "tab"             # accept the selected suggestion
 navigate-up = "up"         # select up, or open history if empty
 navigate-down = "down"     # select down, or open history if empty
 navigate-right = "right"   # accept ghost text
-navigate-closed = "history" # with the menu closed: "history" browses iris history, "shell" passes the key to the shell (e.g. atuin)
 
 [git]
 filter-active-branch = true  # exclude current branch from suggestions

internal/config/config.go

@@ -69,6 +69,15 @@ type CoreConfig struct {
 	Atuin             int    `toml:"atuin-history"`
 	AtuinDBPath       string `toml:"atuin-db-path"`
 	CobraProbeEnabled bool   `toml:"cobra-probe-enabled"`
+	// NavigateClosed decides what the navigate keys do while the suggestion
+	// menu is closed: "history" browses iris' own merged history (the default),
+	// "shell" forwards the key to the shell instead.
+	//
+	// Forwarding matters when the navigate keys are left on the arrows and
+	// something else already owns them at the prompt -- atuin binds Up, for
+	// instance. Without it the only way to keep that binding is to move iris
+	// onto other keys, which costs arrow-key navigation of the menu entirely.
+	NavigateClosed string `toml:"navigate-closed"`
 }
 
 type UIConfig struct {
@@ -101,15 +110,6 @@ type KeybindingsConfig struct {
 	NavigateUp       string `toml:"navigate-up"`
 	NavigateDown     string `toml:"navigate-down"`
 	NavigateRight    string `toml:"navigate-right"`
-	// NavigateClosed decides what the navigate keys do while the suggestion
-	// menu is closed: "history" browses iris' own merged history (the default),
-	// "shell" forwards the key to the shell instead.
-	//
-	// Forwarding matters when the navigate keys are left on the arrows and
-	// something else already owns them at the prompt -- atuin binds Up, for
-	// instance. Without it the only way to keep that binding is to move iris
-	// onto other keys, which costs arrow-key navigation of the menu entirely.
-	NavigateClosed string `toml:"navigate-closed"`
 }
 
 type ZoxideConfig struct {
@@ -279,8 +279,8 @@ func Load() (*Config, error) {
 	if cfg.Keybindings.SelectSuggestion == "" {
 		cfg.Keybindings.SelectSuggestion = "tab"
 	}
-	if cfg.Keybindings.NavigateClosed == "" {
-		cfg.Keybindings.NavigateClosed = "history"
+	if cfg.Core.NavigateClosed == "" {
+		cfg.Core.NavigateClosed = "history"
 	}
 	if cfg.Keybindings.NavigateUp == "" {
 		cfg.Keybindings.NavigateUp = "up"

internal/config/defaults.go

@@ -15,6 +15,7 @@ func DefaultConfig() *Config {
 			ExpandAlias:       true,
 			AutoExecute:       false,
 			CobraProbeEnabled: true,
+			NavigateClosed:    "history",
 		},
 		UI: UIConfig{
 			Style:           "modern",
@@ -56,7 +57,6 @@ func DefaultConfig() *Config {
 			SelectSuggestion: "tab",
 			NavigateUp:       "up",
 			NavigateDown:     "down",
-			NavigateClosed:   "history",
 		},
 	}
 }

root/config_cmd.go

@@ -68,6 +68,10 @@ atuin-db-path = ""
 # probe unknown binaries with ` + "`__complete`" + ` for Cobra-based CLI suggestions.
 cobra-probe-enabled = true
 
+# what navigate-up/navigate-down do while the menu is closed:
+# "history" = browse iris history, "shell" = leave the key to the shell (e.g. atuin)
+navigate-closed = "history"
+
 [ui]
 # visual style: "modern" (icons, category pills, shortcut footer) or "classic" (minimalist, centered number, no icons)
 style = "modern"
@@ -124,9 +128,6 @@ navigate-up = "up"
 navigate-down = "down"
 navigate-right = "right"
 
-# what navigate-up/navigate-down do while the menu is closed:
-# "history" = browse iris history, "shell" = leave the key to the shell
-navigate-closed = "history"
 `
 		err = os.WriteFile(path, []byte(defaultContent), 0644)
 		if err != nil {

root/init.go

@@ -253,6 +253,10 @@ expand-alias = true
 # automatically execute command after accepting suggestion
 auto-execute = false
 
+# what navigate-up/navigate-down do while the menu is closed:
+# "history" = browse iris history, "shell" = leave the key to the shell (e.g. atuin)
+navigate-closed = "history"
+
 [ui]
 # visual style: "modern" (icons, category pills, shortcut footer) or "classic" (minimalist, centered number, no icons)
 style = "modern"
@@ -309,9 +313,6 @@ navigate-up = "up"
 navigate-down = "down"
 navigate-right = "right"
 
-# what navigate-up/navigate-down do while the menu is closed:
-# "history" = browse iris history, "shell" = leave the key to the shell
-navigate-closed = "history"
 `
 				if errWrite := os.WriteFile(path, []byte(defaultContent), 0644); errWrite == nil {
 					fmt.Printf("✓ Initialized default config file at %s\n", path)

root/wrapper.go

@@ -921,7 +921,7 @@ func runWrapper() {
 				// navigate-closed = "shell" leaves the key to the shell while the
 				// menu is closed -- atuin binds Up, and claiming it here is what
 				// forces the navigate keys off the arrows entirely.
-				navToShell := !overlay.IsVisible() && config.Get().Keybindings.NavigateClosed == "shell"
+				navToShell := !overlay.IsVisible() && config.Get().Core.NavigateClosed == "shell"
 				if (isNavUp || isNavDown) && !navToShell {
 					arrowDir := "down"
 					if isNavUp {