Fix config precedence

Author: jotaen

klog.go

@@ -3,11 +3,12 @@ package main
 import (
 	_ "embed"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/jotaen/klog/klog/app"
 	"github.com/jotaen/klog/klog/app/cli/util"
 	"github.com/jotaen/klog/klog/app/main"
-	"os"
-	"runtime"
 )
 
 //go:embed Specification.md
@@ -41,11 +42,7 @@ func main() {
 	}()
 
 	config := func() app.Config {
-		c, err := app.NewConfig(
-			app.FromDeterminedValues{NumCpus: runtime.NumCPU()},
-			app.FromEnvVars{GetVar: os.Getenv},
-			app.FromConfigFile{FileContents: configFile},
-		)
+		c, err := app.NewConfig(runtime.NumCPU(), os.Getenv, configFile)
 		if err != nil {
 			fail(util.PrettifyAppError(err, false), app.CONFIG_ERROR.ToInt())
 		}

klog/app/cli/testcontext_test.go

@@ -1,14 +1,15 @@
 package cli
 
 import (
+	gotime "time"
+
 	"github.com/jotaen/klog/klog"
 	"github.com/jotaen/klog/klog/app"
 	"github.com/jotaen/klog/klog/app/cli/command"
 	tf "github.com/jotaen/klog/klog/app/cli/terminalformat"
 	"github.com/jotaen/klog/klog/parser"
 	"github.com/jotaen/klog/klog/parser/reconciling"
 	"github.com/jotaen/klog/klog/parser/txt"
-	gotime "time"
 )
 
 func NewTestingContext() TestingContext {
@@ -63,11 +64,11 @@ func (ctx TestingContext) _SetFileExplorers(cs []command.Command) TestingContext
 }
 
 func (ctx TestingContext) _SetFileConfig(configFile string) TestingContext {
-	fileCfg := app.FromConfigFile{FileContents: configFile}
-	err := fileCfg.Apply(ctx.config)
+	cfg, err := app.NewConfig(1, func(_ string) string { return "" }, configFile)
 	if err != nil {
 		panic(err)
 	}
+	ctx.config = &cfg
 	return ctx
 }