consolidate types

cmd/cli/cli.go

@@ -13,9 +13,16 @@ import (
 	"github.com/taigrr/gico/types"
 )
 
-type errMsg error
+const (
+	settings Cursor = iota
+	graph
+	commitLog
+)
 
-type model struct {
+type (
+	Cursor int
+	errMsg error
+	model  struct {
 		SettingsModel  Settings
 		GraphModel     Graph
 		CommitLogModel CommitLog
@@ -24,25 +31,23 @@ type model struct {
 		quitting       bool
 		cursor         Cursor
 		err            error
-}
+	}
-
+	CommitLog struct {
-type CommitLog struct {
 		Year     int
 		YearDay  int
 		Commits  [][]types.Commit
 		Selected int
 		Authors  []string
 		Repos    []string
-}
+	}
-
+	Settings struct{}
-type Settings struct{}
+	Graph    struct {
-
-type Graph struct {
 		Selected int
 		Year     int
 		Repos    []string
 		Authors  []string
-}
+	}
+)
 
 var (
 	quitKeys = key.NewBinding(
@@ -55,14 +60,6 @@ var (
 	)
 )
 
-const (
-	settings Cursor = iota
-	graph
-	commitLog
-)
-
-type Cursor int
-
 func initialModel() (model, error) {
 	var m model
 	var err error