Add config for nerd fonts version

docs/Config.md

@@ -62,7 +62,8 @@ gui:
   experimentalShowBranchHeads: false # visualize branch heads with (*) in commits list
   showBottomLine: true # for hiding the bottom information line (unless it has important information to tell you)
   showCommandLog: true
-  showIcons: false
+  showIcons: false # deprecated: use nerdFontsVersion instead
+  nerdFontsVersion: "" # nerd fonts version to use ("2" or "3"); empty means don't show nerd font icons
   commandLogSize: 8
   splitDiff: 'auto' # one of 'auto' | 'always'
   skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor
@@ -420,9 +421,12 @@ If you are using [Nerd Fonts](https://www.nerdfonts.com), you can display icons.
 
 ```yaml
 gui:
-  showIcons: true
+  nerdFontsVersion: "3"
 ```
 
+Supported versions are "2" and "3". The deprecated config `showIcons` sets the
+version to "2" for backwards compatibility.
+
 ## Keybindings
 
 For all possible keybinding options, check [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md)

pkg/config/user_config.go

@@ -49,6 +49,7 @@ type GuiConfig struct {
 	ShowCommandLog              bool               `yaml:"showCommandLog"`
 	ShowBottomLine              bool               `yaml:"showBottomLine"`
 	ShowIcons                   bool               `yaml:"showIcons"`
+	NerdFontsVersion            string             `yaml:"nerdFontsVersion"`
 	ShowBranchCommitHash        bool               `yaml:"showBranchCommitHash"`
 	ExperimentalShowBranchHeads bool               `yaml:"experimentalShowBranchHeads"`
 	CommandLogSize              int                `yaml:"commandLogSize"`
@@ -426,6 +427,7 @@ func GetDefaultConfig() *UserConfig {
 			ShowFileTree:                true,
 			ShowRandomTip:               true,
 			ShowIcons:                   false,
+			NerdFontsVersion:            "",
 			ExperimentalShowBranchHeads: false,
 			ShowBranchCommitHash:        false,
 			CommandLogSize:              8,

pkg/gui/gui.go

@@ -496,7 +496,11 @@ func NewGui(
 	gui.c = helperCommon
 
 	authors.SetCustomAuthors(gui.UserConfig.Gui.AuthorColors)
-	icons.SetIconEnabled(gui.UserConfig.Gui.ShowIcons)
+	if gui.UserConfig.Gui.NerdFontsVersion != "" {
+		icons.SetNerdFontsVersion(gui.UserConfig.Gui.NerdFontsVersion)
+	} else if gui.UserConfig.Gui.ShowIcons {
+		icons.SetNerdFontsVersion("2")
+	}
 	presentation.SetCustomBranches(gui.UserConfig.Gui.BranchColors)
 
 	gui.BackgroundRoutineMgr = &BackgroundRoutineMgr{gui: gui}