A config.go

@@ -0,0 +1,38 @@ 
+package main
+
+import (
+	"log"
+	"os"
+	"path/filepath"
+)
+
+type config struct {
+	todoDir      string
+	taskFilePath string
+}
+
+func NewConfig() config {
+	homePath := os.Getenv("HOME")
+	todoDir, exists := os.LookupEnv("TODO_DIR")
+
+	if !exists {
+		todoDir = filepath.Join(homePath, ".todo")
+	}
+
+	_ = os.MkdirAll(todoDir, os.ModePerm)
+
+	taskFilePath := filepath.Join(todoDir, "todo.txt")
+
+	if _, err := os.Stat(taskFilePath); os.IsNotExist(err) {
+		_, e := os.Create(taskFilePath)
+		if e != nil {
+			log.Fatal(e)
+		}
+
+	}
+
+	return config{
+		todoDir:      todoDir,
+		taskFilePath: taskFilePath,
+	}
+}

M main.go → main.go

@@ -22,6 +22,7 @@ )
 
 type model struct {
 	interfaceState InterfaceState
+	config         config
 	keys           keyMap
 	help           help.Model
 
@@ -34,25 +35,26 @@ }
 
 func initialModel() model {
 
+	config := NewConfig()
+
 	// New task input
 	ti := textinput.New()
 	ti.Focus()
 	ti.CharLimit = 200
 	ti.Width = 200
 
-	if tasklist, err := todo.LoadFromPath("todo.txt"); err != nil {
+	if tasklist, err := todo.LoadFromPath(config.taskFilePath); err != nil {
 		log.Fatal(err)
-		// TODO - Handle error, create file if not exists
-		return model{
-			textInput: ti,
-			keys:      keys,
-			help:      help.New(),
-		}
+		return model{}
 	} else {
 		tasks := tasklist
 		tasks.Sort(todo.SortCompletedDateAsc, todo.SortPriorityAsc)
+		selected := make(map[int]struct{})
 
-		selected := make(map[int]struct{})
+		interfaceState := List
+		if len(tasks) == 0 {
+			interfaceState = Add
+		}
 
 		for i, t := range tasks {
 			if t.Completed {
@@ -61,11 +63,13 @@ }
 		}
 
 		return model{
-			tasks:     tasks,
-			selected:  selected,
-			textInput: ti,
-			keys:      keys,
-			help:      help.New(),
+			interfaceState: interfaceState,
+			config:         config,
+			tasks:          tasks,
+			selected:       selected,
+			textInput:      ti,
+			keys:           keys,
+			help:           help.New(),
 		}
 
 	}
@@ -111,6 +115,7 @@ m.tasks[m.cursor].Priority = strings.ToUpper(msg.String())
 
 			case key.Matches(msg, m.keys.Check):
 				_, ok := m.selected[m.cursor]
+
 				if ok {
 					delete(m.selected, m.cursor)
 					m.tasks[m.cursor].Reopen()
@@ -142,7 +147,7 @@ case key.Matches(msg, m.keys.Add):
 				m.interfaceState = Add
 
 			case key.Matches(msg, m.keys.SaveQuit):
-				m.tasks.WriteToPath("todo.txt")
+				m.tasks.WriteToPath(m.config.taskFilePath)
 				return m, tea.Quit
 
 			case key.Matches(msg, m.keys.Quit):
@@ -176,8 +181,6 @@ 
 		}
 	}
 
-	// Return the updated model to the Bubble Tea runtime for processing.
-	// Note that we're not returning a command.
 	return m, nil
 }
 
@@ -187,19 +190,23 @@ 
 	switch m.interfaceState {
 
 	case List:
+		if len(m.tasks) > 0 {
 
-		// Iterate over our tasks
-		for i, task := range m.tasks {
+			for i, task := range m.tasks {
 
-			cursor := " "
-			if m.cursor == i {
-				cursor = "→"
+				cursor := " "
+				if m.cursor == i {
+					cursor = "→"
+				}
+
+				// Render the row
+				_, checked := m.selected[i]
+				styles := NewTextStyle()
+				output += fmt.Sprintf("%s %s\n", cursor, styles.getTaskStyle(task, checked))
 			}
 
-			// Render the row
-			_, checked := m.selected[i]
-			styles := NewTextStyle()
-			output += fmt.Sprintf("%s %s\n", cursor, styles.getTaskStyle(task, checked))
+		} else {
+			output += "No tasks in file"
 		}
 
 		output += "\n"

M style.go → style.go

@@ -18,6 +18,7 @@ Priority PriorityStyle
 	Check    lipgloss.Style
 	Context  lipgloss.Style
 	Project  lipgloss.Style
+	KeyValue lipgloss.Style
 }
 
 type TaskStyle struct {
@@ -50,6 +51,7 @@ Task:     taskStyle,
 		Check:    lipgloss.NewStyle().Foreground(lipgloss.Color(Catppuccin.Blue().Hex)),
 		Context:  lipgloss.NewStyle().Foreground(lipgloss.Color(Catppuccin.Blue().Hex)),
 		Project:  lipgloss.NewStyle().Foreground(lipgloss.Color(Catppuccin.Mauve().Hex)),
+		KeyValue: lipgloss.NewStyle().Foreground(lipgloss.Color(Catppuccin.Flamingo().Hex)),
 	}
 	return style
 }
@@ -60,8 +62,9 @@ todoText := task.Original
 
 	checkedRegex := regexp.MustCompile(`^x (\d{4}-\d{2}-\d{2} )? ?`)
 	priorityRegex := regexp.MustCompile(`^\([A-Z]\) `)
-	contextRegex := regexp.MustCompile(`#\w+`)
+	contextRegex := regexp.MustCompile(`@\w+`)
 	projectRegex := regexp.MustCompile(`\+\w+`)
+	keyValueRegex := regexp.MustCompile(`.+:.+`)
 
 	todoText = checkedRegex.ReplaceAllString(todoText, "")
 	todoText = priorityRegex.ReplaceAllString(todoText, "")
@@ -81,6 +84,9 @@ todoText = contextRegex.ReplaceAllStringFunc(todoText, func(match string) string {
 			return s.Context.Render(match)
 		})
 		todoText = projectRegex.ReplaceAllStringFunc(todoText, func(match string) string {
+			return s.Project.Render(match)
+		})
+		todoText = keyValueRegex.ReplaceAllStringFunc(todoText, func(match string) string {
 			return s.Project.Render(match)
 		})
 		return fmt.Sprintf("%s %s %s", s.Check.Render(checkString), s.getPriorityStyle(task.Priority), s.Task.Todo.Render(todoText))