cmd/gim/main.go

@@ -17,8 +17,10 @@ func generateLines(n int) []string {
 }
 
 func main() {
+
+	// lines := []string{"Hello world testing main.go", "line 2", "line 3", "line 4", "line 5"}
 	tea.NewProgram(
-		editor.NewModel(generateLines(64), action.Position{Line: 0, Col: 0}),
+		editor.NewModel(generateLines(32), action.Position{Line: 0, Col: 0}),
 		tea.WithAltScreen(),
 	).Run()
 }

internal/action/action.go

@@ -1,8 +1,6 @@
 package action
 
-import (
-	tea "github.com/charmbracelet/bubbletea"
-)
+import tea "github.com/charmbracelet/bubbletea"
 
 // Mode constants for editor mode
 type Mode int
@@ -16,31 +14,6 @@ const (
 	VisualBlockMode
 )
 
-func (m Mode) ToString() string {
-	switch m {
-	case NormalMode:
-		return "NORMAL"
-	case InsertMode:
-		return "INSERT"
-	case CommandMode:
-		return "COMMAND"
-	case VisualMode:
-		return "VISUAL"
-	case VisualLineMode:
-		return "V-LINE"
-	case VisualBlockMode:
-		return "V-BLOCK"
-	default:
-		return "-----"
-	}
-}
-
-func (m Mode) IsVisualMode() bool {
-	return m == VisualMode ||
-		m == VisualLineMode ||
-		m == VisualBlockMode
-}
-
 // Model defines the interface for editor state that actions can modify
 type Model interface {
 	// Text buffer
@@ -73,11 +46,13 @@ type Model interface {
 	SetInsertKeys(keys []string)
 
 	// Settings
-	Settings() Settings
+	TabSize() int
+	ScrollOff() int
 
 	// Mode
 	Mode() Mode
 	SetMode(mode Mode)
+	IsVisualMode() bool
 
 	// Insert recording (for count replay)
 	SetInsertRecording(count int, action Action)

internal/action/insert.go

@@ -204,7 +204,7 @@ type InsertTab struct{}
 func (a InsertTab) Execute(m Model) tea.Cmd {
 	x, y := m.CursorX(), m.CursorY()
 	l := m.Line(y)
-	tabs := strings.Repeat(" ", m.Settings().TabSize)
+	tabs := strings.Repeat(" ", m.TabSize())
 	if x < len(l) {
 		m.SetLine(y, l[:x]+tabs+l[x:])
 	} else {

internal/action/settings.go

@@ -1,20 +0,0 @@
-package action
-
-type Settings struct {
-	Number         bool
-	RelativeNumber bool
-	GutterSize     int
-	TabSize        int
-	ScrollOff      int
-	// TODO: Colors
-}
-
-func NewDefaultSettings() Settings {
-	return Settings{
-		Number:         true,
-		RelativeNumber: true,
-		GutterSize:     5,
-		TabSize:        2,
-		ScrollOff:      8,
-	}
-}

internal/editor/model.go

@@ -30,7 +30,9 @@ type Model struct {
 	insertAction action.Action
 
 	// Settings
-	settings action.Settings
+	gutterSize int
+	tabSize    int
+	scrollOff  int
 }
 
 func NewModel(lines []string, pos action.Position) Model {
@@ -40,11 +42,14 @@ func NewModel(lines []string, pos action.Position) Model {
 			x: pos.Col,
 			y: pos.Line,
 		},
-		scrollY:  0,
-		mode:     action.NormalMode,
-		command:  "",
-		input:    input.NewHandler(),
-		settings: action.NewDefaultSettings(),
+		scrollY: 0,
+		mode:    action.NormalMode,
+		command: "",
+		input:   input.NewHandler(),
+
+		gutterSize: 5,
+		tabSize:    2,
+		scrollOff:  8,
 	}
 }
 
@@ -134,8 +139,12 @@ func (m *Model) SetInsertKeys(keys []string) {
 }
 
 // Settings
-func (m *Model) Settings() action.Settings {
-	return m.settings
+func (m *Model) TabSize() int {
+	return m.tabSize
+}
+
+func (m *Model) ScrollOff() int {
+	return m.scrollOff
 }
 
 // Window
@@ -165,7 +174,7 @@ func (m *Model) AdjustScroll() {
 	}
 
 	// Effective scrollOff (can't be more than half the viewport)
-	off := min(m.Settings().ScrollOff, viewportHeight/2)
+	off := min(m.ScrollOff(), viewportHeight/2)
 
 	// Cursor too close to top — scroll up
 	if m.CursorY() < m.ScrollY()+off {
@@ -190,6 +199,12 @@ func (m *Model) SetMode(mode action.Mode) {
 	m.mode = mode
 }
 
+func (m *Model) IsVisualMode() bool {
+	return m.mode == action.VisualMode ||
+		m.mode == action.VisualLineMode ||
+		m.mode == action.VisualBlockMode
+}
+
 func (m *Model) SetInsertRecording(count int, act action.Action) {
 	m.insertCount = count
 	m.insertKeys = []string{}
@@ -275,7 +290,7 @@ func (m *Model) processInsertKey(key string) {
 		}
 
 	case "tab":
-		tabs := strings.Repeat(" ", m.Settings().TabSize)
+		tabs := strings.Repeat(" ", m.tabSize)
 		if x < len(l) {
 			m.SetLine(y, l[:x]+tabs+l[x:])
 		} else {

internal/editor/style.go

@@ -36,7 +36,7 @@ func (m Model) gutterStyle(currentLine bool) lipgloss.Style {
 		fg = lipgloss.Color("#d69d00")
 	}
 	return lipgloss.NewStyle().
-		Width(m.Settings().GutterSize).
+		Width(m.gutterSize).
 		Background(bg).
 		Foreground(fg)
 }

internal/editor/view.go

@@ -67,39 +67,27 @@ func (m Model) View() string {
 
 		if i < m.LineCount() {
 
-			if m.Settings().Number || m.Settings().RelativeNumber {
-				var (
-					gutter      string
-					currentLine bool = false
-					lineNumber  int
-				)
-
-				if m.Settings().RelativeNumber {
-					// Relative line numbers: show distance from cursor, current line shows absolute
-					if i > m.CursorY() {
-						lineNumber = i - m.CursorY()
-						gutter = fmt.Sprintf("%*d ", m.Settings().GutterSize-1, lineNumber)
-					} else if i < m.CursorY() {
-						lineNumber = m.CursorY() - i
-						gutter = fmt.Sprintf("%*d ", m.Settings().GutterSize-1, lineNumber)
-					} else {
-						// Current line: show absolute number if Number is also set, otherwise show 0
-						currentLine = true
-						if m.Settings().Number {
-							lineNumber = i + 1
-							gutter = fmt.Sprintf("%*d ", m.Settings().GutterSize-1, lineNumber)
-						} else {
-							gutter = fmt.Sprintf("%*d ", m.Settings().GutterSize-1, 0)
-						}
-					}
-				} else if m.Settings().Number {
-					// Absolute line numbers only
-					lineNumber = i + 1
-					currentLine = (i == m.CursorY())
-					gutter = fmt.Sprintf("%*d ", m.Settings().GutterSize-1, lineNumber)
+			var (
+				gutter      string
+				currentLine bool = false
+				lineNumber  int
+			)
+			if i > m.CursorY() {
+				lineNumber = i - m.CursorY()
+				gutter = fmt.Sprintf("%*d ", m.gutterSize-1, lineNumber)
+			} else if i < m.CursorY() {
+				lineNumber = m.CursorY() - i
+				gutter = fmt.Sprintf("%*d ", m.gutterSize-1, lineNumber)
+			} else {
+				lineNumber = i + 1
+				currentLine = true
+				if lineNumber < 100 {
+					gutter = fmt.Sprintf("%*d  ", m.gutterSize-2, lineNumber)
+				} else {
+					gutter = fmt.Sprintf("%*d ", m.gutterSize-1, lineNumber)
 				}
-				view.WriteString(m.gutterStyle(currentLine).Render(gutter))
 			}
+			view.WriteString(m.gutterStyle(currentLine).Render(gutter))
 
 			runes := []rune(m.Line(i))
 			for x := 0; x <= len(runes); x++ {
@@ -110,67 +98,54 @@ func (m Model) View() string {
 						view.WriteString(m.cursorStyle().Render(" "))
 					}
 				} else if x < len(runes) {
-					if m.Mode().IsVisualMode() && posIsAnchor(m, x, i) {
+					if m.IsVisualMode() && posIsAnchor(m, x, i) {
 						view.WriteString(m.visualAnchorStyle().Render(string(runes[x])))
-					} else if m.Mode().IsVisualMode() && posInsideSelection(m, x, i) {
+					} else if m.IsVisualMode() && posInsideSelection(m, x, i) {
 						view.WriteString(m.visualHighlightStyle().Render(string(runes[x])))
 					} else {
 						view.WriteRune(runes[x])
 					}
 					// To highlight blank lines when in visual mode
-				} else if m.Mode().IsVisualMode() && posInsideSelection(m, x, i) {
+				} else if m.IsVisualMode() && posInsideSelection(m, x, i) {
 					view.WriteString(m.visualHighlightStyle().Render(" "))
 				}
 			}
 		} else {
-			// Empty lines beyond file content
-			if m.Settings().Number || m.Settings().RelativeNumber {
-				format := fmt.Sprintf("%%-%ds ", m.Settings().GutterSize-1)
-				fmt.Fprintf(&view, format, "~")
-			} else {
-				view.WriteString("~")
-			}
+			format := fmt.Sprintf("%%-%ds ", m.gutterSize-1)
+			fmt.Fprintf(&view, format, "~")
 		}
 
 		view.WriteString("\n")
 	}
 
-	bar := drawStatusBar(m)
+	// Draw status bar
+	var modeString string
+	switch m.Mode() {
+	case action.NormalMode:
+		modeString = "NORMAL"
+	case action.InsertMode:
+		modeString = "INSERT"
+	case action.CommandMode:
+		modeString = "COMMAND"
+	case action.VisualMode:
+		modeString = "VISUAL"
+	case action.VisualLineMode:
+		modeString = "V-LINE"
+	case action.VisualBlockMode:
+		modeString = "V-BLOCK"
+	}
+
+	// DEBUG BAR! Def not the final bar
+	var bar string
+	if m.Mode() == action.CommandMode {
+		bar = fmt.Sprintf(" %6s | %d:%d (%d:%d) :%s ", modeString, m.cursor.x, m.cursor.y, m.win_w, m.win_h, m.command)
+	} else if m.IsVisualMode() {
+		bar = fmt.Sprintf(" %6s | %d:%d (%d:%d) <%d, %d> ", modeString, m.cursor.x, m.cursor.y, m.win_w, m.win_h, m.AnchorX(), m.AnchorY())
+	} else {
+		bar = fmt.Sprintf(" %6s | %d:%d (%d:%d) | %s | %+v | %d", modeString, m.cursor.x, m.cursor.y, m.win_w, m.win_h, m.input.Pending(), m.insertKeys, m.insertCount)
+	}
+
 	view.WriteString(bar)
 
 	return view.String()
 }
-
-func drawStatusBar(m Model) string {
-	left := leftBar(m)
-	right := rightBar(m)
-
-	diff := m.win_w - (len(left) + len(right))
-
-	// This happens when the terminal spawns
-	if diff <= 0 {
-		return ""
-	}
-
-	middle := strings.Repeat(" ", diff)
-	return left + middle + right
-}
-
-func leftBar(m Model) (bar string) {
-	if m.Mode() == action.CommandMode {
-		bar = fmt.Sprintf(":%s", m.command)
-	} else {
-		bar = fmt.Sprintf(" %s", m.Mode().ToString())
-	}
-	return
-}
-
-func rightBar(m Model) (bar string) {
-	if m.Mode().IsVisualMode() {
-		lineCount := max(m.AnchorY(), m.CursorY()) - min(m.AnchorY(), m.CursorY()) + 1
-		bar = fmt.Sprintf("%d:%d  <%d>", m.CursorY(), m.CursorX(), lineCount)
-	} else {
-		bar = fmt.Sprintf("%d:%d ", m.CursorY(), m.CursorX())
-	}
-	return
-}

internal/input/handler.go

@@ -139,7 +139,7 @@ func (h *Handler) handleInitial(m action.Model, kind string, binding any, key st
 	case "operator":
 		op := binding.(action.Operator)
 		// In visual mode, the selection is already defined — operate immediately
-		if m.Mode().IsVisualMode() {
+		if m.IsVisualMode() {
 			start, end := normalizeVisualSelection(m)
 			// Visual line mode is linewise, others are charwise
 			mtype := action.Charwise