Use getters for AppState and UserConfig instead of accessing the fields directly

This will allow us to make them private.

pkg/integration/tests/bisect/basic.go

@@ -15,7 +15,7 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
 			CreateNCommits(10)
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.AppState.GitLogShowGraph = "never"
+		cfg.GetAppState().GitLogShowGraph = "never"
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		markCommitAsBad := func() {

pkg/integration/tests/bisect/choose_terms.go

@@ -15,7 +15,7 @@ var ChooseTerms = NewIntegrationTest(NewIntegrationTestArgs{
 			CreateNCommits(10)
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.AppState.GitLogShowGraph = "never"
+		cfg.GetAppState().GitLogShowGraph = "never"
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		markCommitAsFixed := func() {

pkg/integration/tests/bisect/skip.go

@@ -14,7 +14,7 @@ var Skip = NewIntegrationTest(NewIntegrationTestArgs{
 			CreateNCommits(10)
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.AppState.GitLogShowGraph = "never"
+		cfg.GetAppState().GitLogShowGraph = "never"
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Commits().

pkg/integration/tests/branch/rebase_copied_branch.go

@@ -11,7 +11,7 @@ var RebaseCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/branch/rebase_onto_base_branch.go

@@ -10,7 +10,7 @@ var RebaseOntoBaseBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowDivergenceFromBaseBranch = "arrowAndNumber"
+		config.GetUserConfig().Gui.ShowDivergenceFromBaseBranch = "arrowAndNumber"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/branch/show_divergence_from_base_branch.go

@@ -10,7 +10,7 @@ var ShowDivergenceFromBaseBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowDivergenceFromBaseBranch = "arrowAndNumber"
+		config.GetUserConfig().Gui.ShowDivergenceFromBaseBranch = "arrowAndNumber"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go

@@ -10,7 +10,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/commit/auto_wrap_message.go

@@ -11,7 +11,7 @@ var AutoWrapMessage = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
 		// Use a ridiculously small width so that we don't have to use so much test data
-		config.UserConfig.Git.Commit.AutoWrapWidth = 20
+		config.GetUserConfig().Git.Commit.AutoWrapWidth = 20
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFile("file", "file content")

pkg/integration/tests/commit/commit_wip_with_prefix.go

@@ -9,8 +9,8 @@ var CommitWipWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Commit with skip hook and config commitPrefix is defined. Prefix is ignored when creating WIP commits.",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig: func(testConfig *config.AppConfig) {
+	SetupConfig: func(cfg *config.AppConfig) {
-		testConfig.UserConfig.Git.CommitPrefixes = map[string]config.CommitPrefixConfig{"repo": {Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}}
+		cfg.GetUserConfig().Git.CommitPrefixes = map[string]config.CommitPrefixConfig{"repo": {Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}}
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("feature/TEST-002")

pkg/integration/tests/commit/commit_with_global_prefix.go

@@ -9,8 +9,8 @@ var CommitWithGlobalPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Commit with defined config commitPrefix",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig: func(testConfig *config.AppConfig) {
+	SetupConfig: func(cfg *config.AppConfig) {
-		testConfig.UserConfig.Git.CommitPrefix = &config.CommitPrefixConfig{Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}
+		cfg.GetUserConfig().Git.CommitPrefix = &config.CommitPrefixConfig{Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("feature/TEST-001")

pkg/integration/tests/commit/commit_with_non_matching_branch_name.go

@@ -9,8 +9,8 @@ var CommitWithNonMatchingBranchName = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Commit with defined config commitPrefixes",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig: func(testConfig *config.AppConfig) {
+	SetupConfig: func(cfg *config.AppConfig) {
-		testConfig.UserConfig.Git.CommitPrefix = &config.CommitPrefixConfig{
+		cfg.GetUserConfig().Git.CommitPrefix = &config.CommitPrefixConfig{
 			Pattern: "^\\w+\\/(\\w+-\\w+).*",
 			Replace: "[$1]: ",
 		}

pkg/integration/tests/commit/commit_with_prefix.go

@@ -9,8 +9,8 @@ var CommitWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Commit with defined config commitPrefixes",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig: func(testConfig *config.AppConfig) {
+	SetupConfig: func(cfg *config.AppConfig) {
-		testConfig.UserConfig.Git.CommitPrefixes = map[string]config.CommitPrefixConfig{"repo": {Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}}
+		cfg.GetUserConfig().Git.CommitPrefixes = map[string]config.CommitPrefixConfig{"repo": {Pattern: "^\\w+\\/(\\w+-\\w+).*", Replace: "[$1]: "}}
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("feature/TEST-001")

pkg/integration/tests/commit/highlight.go

@@ -10,7 +10,7 @@ var Highlight = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "always"
+		config.GetAppState().GitLogShowGraph = "always"
 		config.GetUserConfig().Gui.AuthorColors = map[string]string{
 			"CI": "red",
 		}

pkg/integration/tests/commit/new_branch_with_prefix.go

@@ -10,7 +10,7 @@ var NewBranchWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.Git.BranchPrefix = "myprefix/"
+		cfg.GetUserConfig().Git.BranchPrefix = "myprefix/"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/commit/paste_commit_message.go

@@ -10,8 +10,8 @@ var PasteCommitMessage = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.OS.CopyToClipboardCmd = "echo {{text}} > ../clipboard"
+		config.GetUserConfig().OS.CopyToClipboardCmd = "echo {{text}} > ../clipboard"
-		config.UserConfig.OS.ReadFromClipboardCmd = "cat ../clipboard"
+		config.GetUserConfig().OS.ReadFromClipboardCmd = "cat ../clipboard"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("subject\n\nbody 1st line\nbody 2nd line")

pkg/integration/tests/commit/paste_commit_message_over_existing.go

@@ -10,8 +10,8 @@ var PasteCommitMessageOverExisting = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.OS.CopyToClipboardCmd = "echo {{text}} > ../clipboard"
+		config.GetUserConfig().OS.CopyToClipboardCmd = "echo {{text}} > ../clipboard"
-		config.UserConfig.OS.ReadFromClipboardCmd = "cat ../clipboard"
+		config.GetUserConfig().OS.ReadFromClipboardCmd = "cat ../clipboard"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("subject\n\nbody 1st line\nbody 2nd line")

pkg/integration/tests/custom_commands/access_commit_properties.go

@@ -15,7 +15,7 @@ var AccessCommitProperties = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("my change")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "X",
 				Context: "commits",

pkg/integration/tests/custom_commands/basic_command.go

@@ -13,7 +13,7 @@ var BasicCommand = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("blah")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "files",

pkg/integration/tests/custom_commands/check_for_conflicts.go

@@ -14,7 +14,7 @@ var CheckForConflicts = NewIntegrationTest(NewIntegrationTestArgs{
 		shared.MergeConflictsSetup(shell)
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "m",
 				Context: "localBranches",

pkg/integration/tests/custom_commands/form_prompts.go

@@ -13,7 +13,7 @@ var FormPrompts = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("blah")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "files",

pkg/integration/tests/custom_commands/global_context.go

@@ -13,7 +13,7 @@ var GlobalContext = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("my change")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:        "X",
 				Context:    "global",

pkg/integration/tests/custom_commands/menu_from_command.go

@@ -19,7 +19,7 @@ var MenuFromCommand = NewIntegrationTest(NewIntegrationTestArgs{
 			NewBranch("feature/foo")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "localBranches",

pkg/integration/tests/custom_commands/menu_from_commands_output.go

@@ -18,7 +18,7 @@ var MenuFromCommandsOutput = NewIntegrationTest(NewIntegrationTestArgs{
 			EmptyCommit("baz")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "localBranches",

pkg/integration/tests/custom_commands/multiple_contexts.go

@@ -13,7 +13,7 @@ var MultipleContexts = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("my change")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:        "X",
 				Context:    "commits, reflogCommits",

pkg/integration/tests/custom_commands/multiple_prompts.go

@@ -13,7 +13,7 @@ var MultiplePrompts = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("blah")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "files",

pkg/integration/tests/custom_commands/selected_commit.go

@@ -13,7 +13,7 @@ var SelectedCommit = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.CreateNCommits(3)
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "X",
 				Context: "global",

pkg/integration/tests/custom_commands/selected_path.go

@@ -17,7 +17,7 @@ var SelectedPath = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.CreateFile("folder2/file2", "")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "X",
 				Context: "global",

pkg/integration/tests/custom_commands/show_output_in_panel.go

@@ -15,7 +15,7 @@ var ShowOutputInPanel = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("my change")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:        "X",
 				Context:    "commits",

pkg/integration/tests/custom_commands/suggestions_command.go

@@ -20,7 +20,7 @@ var SuggestionsCommand = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("blah")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "localBranches",

pkg/integration/tests/custom_commands/suggestions_preset.go

@@ -20,7 +20,7 @@ var SuggestionsPreset = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("blah")
 	},
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "localBranches",

pkg/integration/tests/demo/amend_old_commit.go

@@ -12,7 +12,7 @@ var AmendOldCommit = NewIntegrationTest(NewIntegrationTestArgs{
 	IsDemo:       true,
 	SetupConfig: func(config *config.AppConfig) {
 		setDefaultDemoConfig(config)
-		config.UserConfig.Gui.ShowFileTree = false
+		config.GetUserConfig().Gui.ShowFileTree = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateNCommitsWithRandomMessages(60)

pkg/integration/tests/demo/custom_command.go

@@ -26,7 +26,7 @@ var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupConfig: func(cfg *config.AppConfig) {
 		setDefaultDemoConfig(cfg)
 
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "a",
 				Context: "localBranches",

pkg/integration/tests/demo/diff_commits.go

@@ -13,8 +13,8 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupConfig: func(config *config.AppConfig) {
 		setDefaultDemoConfig(config)
 
-		config.UserConfig.Gui.ShowFileTree = false
+		config.GetUserConfig().Gui.ShowFileTree = false
-		config.UserConfig.Gui.ShowCommandLog = false
+		config.GetUserConfig().Gui.ShowCommandLog = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateNCommitsWithRandomMessages(50)

pkg/integration/tests/demo/nuke_working_tree.go

@@ -12,7 +12,7 @@ var NukeWorkingTree = NewIntegrationTest(NewIntegrationTestArgs{
 	IsDemo:       true,
 	SetupConfig: func(config *config.AppConfig) {
 		setDefaultDemoConfig(config)
-		config.UserConfig.Gui.AnimateExplosion = true
+		config.GetUserConfig().Gui.AnimateExplosion = true
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("blah")

pkg/integration/tests/demo/shared.go

@@ -4,7 +4,7 @@ import "github.com/jesseduffield/lazygit/pkg/config"
 
 // Gives us nicer colours when we generate a git repo history with `shell.CreateRepoHistory()`
 func setGeneratedAuthorColours(config *config.AppConfig) {
-	config.UserConfig.Gui.AuthorColors = map[string]string{
+	config.GetUserConfig().Gui.AuthorColors = map[string]string{
 		"Fredrica Greenhill": "#fb5aa3",
 		"Oscar Reuenthal":    "#86c82f",
 		"Paul Oberstein":     "#ffd500",
@@ -15,5 +15,5 @@ func setGeneratedAuthorColours(config *config.AppConfig) {
 
 func setDefaultDemoConfig(config *config.AppConfig) {
 	// demos look much nicers with icons shown
-	config.UserConfig.Gui.NerdFontsVersion = "3"
+	config.GetUserConfig().Gui.NerdFontsVersion = "3"
 }

pkg/integration/tests/demo/stage_lines.go

@@ -40,8 +40,8 @@ var StageLines = NewIntegrationTest(NewIntegrationTestArgs{
 	IsDemo:       true,
 	SetupConfig: func(config *config.AppConfig) {
 		setDefaultDemoConfig(config)
-		config.UserConfig.Gui.ShowFileTree = false
+		config.GetUserConfig().Gui.ShowFileTree = false
-		config.UserConfig.Gui.ShowCommandLog = false
+		config.GetUserConfig().Gui.ShowCommandLog = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("docs-fix")

pkg/integration/tests/file/copy_menu.go

@@ -17,7 +17,7 @@ var CopyMenu = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.OS.CopyToClipboardCmd = "echo {{text}} > clipboard"
+		config.GetUserConfig().OS.CopyToClipboardCmd = "echo {{text}} > clipboard"
 	},
 	SetupRepo: func(shell *Shell) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {

pkg/integration/tests/filter_and_search/filter_fuzzy.go

@@ -10,7 +10,7 @@ var FilterFuzzy = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.FilterMode = "fuzzy"
+		config.GetUserConfig().Gui.FilterMode = "fuzzy"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("this-is-my-branch")

pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go

@@ -10,7 +10,7 @@ var FilterMenuWithNoKeybindings = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Keybinding.Universal.ToggleWhitespaceInDiffView = "<disabled>"
+		config.GetUserConfig().Keybinding.Universal.ToggleWhitespaceInDiffView = "<disabled>"
 	},
 	SetupRepo: func(shell *Shell) {
 	},

pkg/integration/tests/filter_by_author/select_author.go

@@ -10,7 +10,7 @@ var SelectAuthor = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		commonSetup(shell)

pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go

@@ -11,7 +11,7 @@ var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/interactive_rebase/drop_commit_in_copied_branch_with_update_ref.go

@@ -11,7 +11,7 @@ var DropCommitInCopiedBranchWithUpdateRef = NewIntegrationTest(NewIntegrationTes
 	Skip:         false,
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go

@@ -12,7 +12,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
 		config.GetUserConfig().Git.MainBranches = []string{"master"}
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go

@@ -11,7 +11,7 @@ var InteractiveRebaseOfCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go

@@ -12,7 +12,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
 		config.GetUserConfig().Git.MainBranches = []string{"master"}
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go

@@ -12,7 +12,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
 		config.GetUserConfig().Git.MainBranches = []string{"master"}
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/interactive_rebase/show_exec_todos.go

@@ -10,7 +10,7 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "X",
 				Context: "commits",

pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go

@@ -11,7 +11,7 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	GitVersion:   AtLeast("2.38.0"),
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.

pkg/integration/tests/misc/confirm_on_quit.go

@@ -10,7 +10,7 @@ var ConfirmOnQuit = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.ConfirmOnQuit = true
+		config.GetUserConfig().ConfirmOnQuit = true
 	},
 	SetupRepo: func(shell *Shell) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {

pkg/integration/tests/misc/copy_to_clipboard.go

@@ -12,7 +12,7 @@ var CopyToClipboard = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.OS.CopyToClipboardCmd = "echo {{text}} > clipboard"
+		config.GetUserConfig().OS.CopyToClipboardCmd = "echo {{text}} > clipboard"
 	},
 
 	SetupRepo: func(shell *Shell) {

pkg/integration/tests/misc/disabled_keybindings.go

@@ -10,10 +10,10 @@ var DisabledKeybindings = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Keybinding.Universal.PrevItem = "<disabled>"
+		config.GetUserConfig().Keybinding.Universal.PrevItem = "<disabled>"
-		config.UserConfig.Keybinding.Universal.NextItem = "<disabled>"
+		config.GetUserConfig().Keybinding.Universal.NextItem = "<disabled>"
-		config.UserConfig.Keybinding.Universal.NextTab = "<up>"
+		config.GetUserConfig().Keybinding.Universal.NextTab = "<up>"
-		config.UserConfig.Keybinding.Universal.PrevTab = "<down>"
+		config.GetUserConfig().Keybinding.Universal.PrevTab = "<down>"
 	},
 	SetupRepo: func(shell *Shell) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {

pkg/integration/tests/misc/initial_open.go

@@ -10,7 +10,7 @@ var InitialOpen = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.DisableStartupPopups = false
+		config.GetUserConfig().DisableStartupPopups = false
 	},
 	SetupRepo: func(shell *Shell) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {

pkg/integration/tests/reflog/do_not_show_branch_markers_in_reflog_subcommits.go

@@ -10,7 +10,7 @@ var DoNotShowBranchMarkersInReflogSubcommits = NewIntegrationTest(NewIntegration
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
+		config.GetAppState().GitLogShowGraph = "never"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("branch1")

pkg/integration/tests/status/log_cmd.go

@@ -10,8 +10,8 @@ var LogCmd = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Git.AllBranchesLogCmd = `echo "view1"`
+		config.GetUserConfig().Git.AllBranchesLogCmd = `echo "view1"`
-		config.UserConfig.Git.AllBranchesLogCmds = []string{`echo "view2"`}
+		config.GetUserConfig().Git.AllBranchesLogCmds = []string{`echo "view2"`}
 	},
 	SetupRepo: func(shell *Shell) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {

pkg/integration/tests/status/show_divergence_from_base_branch.go

@@ -10,7 +10,7 @@ var ShowDivergenceFromBaseBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowDivergenceFromBaseBranch = "arrowAndNumber"
+		config.GetUserConfig().Gui.ShowDivergenceFromBaseBranch = "arrowAndNumber"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateNCommits(2)

pkg/integration/tests/submodule/enter.go

@@ -10,7 +10,7 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "e",
 				Context: "files",

pkg/integration/tests/submodule/reset.go

@@ -10,7 +10,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "e",
 				Context: "files",

pkg/integration/tests/ui/keybinding_suggestions_when_switching_repos.go

@@ -13,7 +13,7 @@ var KeybindingSuggestionsWhenSwitchingRepos = NewIntegrationTest(NewIntegrationT
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
 		otherRepo, _ := filepath.Abs("../other")
-		config.AppState.RecentRepos = []string{otherRepo}
+		config.GetAppState().RecentRepos = []string{otherRepo}
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CloneNonBare("other")

pkg/integration/tests/ui/open_link_failure.go

@@ -10,7 +10,7 @@ var OpenLinkFailure = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.OS.OpenLink = "exit 42"
+		config.GetUserConfig().OS.OpenLink = "exit 42"
 	},
 	SetupRepo: func(shell *Shell) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {

pkg/integration/tests/worktree/bare_repo_worktree_config.go

@@ -15,7 +15,7 @@ var BareRepoWorktreeConfig = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{"--git-dir={{.actualPath}}/.bare"},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowFileTree = false
+		config.GetUserConfig().Gui.ShowFileTree = false
 	},
 	SetupRepo: func(shell *Shell) {
 		// we're going to have a directory structure like this:

pkg/integration/tests/worktree/custom_command.go

@@ -10,7 +10,7 @@ var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
 			{
 				Key:     "d",
 				Context: "worktrees",

pkg/integration/tests/worktree/double_nested_linked_submodule.go

@@ -13,7 +13,7 @@ var DoubleNestedLinkedSubmodule = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowFileTree = false
+		config.GetUserConfig().Gui.ShowFileTree = false
 	},
 	SetupRepo: func(shell *Shell) {
 		// we're going to have a directory structure like this:

pkg/integration/tests/worktree/symlink_into_repo_subdir.go

@@ -10,7 +10,7 @@ var SymlinkIntoRepoSubdir = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowFileTree = false
+		config.GetUserConfig().Gui.ShowFileTree = false
 	},
 	SetupRepo: func(shell *Shell) {
 		// we're going to have a directory structure like this: