fix(themes): adjust themes for correct rendering

JanDeDobbeleer · Feb 15, 2024 · 9e7237a · 9e7237a
1 parent fece104
commit 9e7237a
Show file tree

Hide file tree

Showing 18 changed files with 652 additions and 29 deletions.
diff --git a/src/cli/config_export_image.go b/src/cli/config_export_image.go
@@ -62,6 +62,7 @@ Exports the config to an image file using customized output options.`,
 		// set sane defaults for things we don't print
 		cfg.ConsoleTitleTemplate = ""
 		cfg.PWD = ""
+		cfg.OSC99 = false
 
 		// add variables to the environment
 		env.Var = cfg.Var

diff --git a/src/engine/image.go b/src/engine/image.go
@@ -30,6 +30,7 @@ import (
 	"math"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"unicode/utf8"
@@ -327,7 +328,8 @@ var doubleWidthRunes = []RuneRange{
 // Nerd Font glyphs will return 1, since most are double width
 func (ir *ImageRenderer) runeAdditionalWidth(r rune) int {
 	// exclude the round leading diamond
-	if r == '\ue0b6' {
+	singles := []rune{'\ue0b6', '\ue0ba', '\ue0bc'}
+	if slices.Contains(singles, r) {
 		return 0
 	}
 

diff --git a/themes/avit.omp.json b/themes/avit.omp.json
@@ -41,7 +41,7 @@
         {
           "foreground": "#007ACC",
           "style": "plain",
-          "template": "\ue602 ",
+          "template": "\ue602",
           "type": "text"
         }
       ],

diff --git a/themes/blue-owl.omp.json b/themes/blue-owl.omp.json
@@ -82,8 +82,9 @@
           "background": "#29315A",
           "foreground": "#43CCEA",
           "leading_diamond": "\ue0c5",
+          "trailing_diamond": "\ue0bc",
           "style": "diamond",
-          "template": "  {{ .UserName }}<transparent> / </>{{ .HostName }}",
+          "template": "  {{ .UserName }}<transparent> / </>{{ .HostName }} ",
           "type": "session"
         },
         {
@@ -92,8 +93,9 @@
           "properties": {
             "time_format": "15:04:05"
           },
-          "style": "plain",
-          "template": "<transparent> \ue0ba\ue0bc </>{{ .CurrentDate | date .Format }} ",
+          "leading_diamond": "\ue0ba",
+          "style": "diamond",
+          "template": " {{ .CurrentDate | date .Format }} ",
           "type": "time"
         }
       ],

diff --git a/themes/chips.omp.json b/themes/chips.omp.json
@@ -37,13 +37,9 @@
           "foreground": "p:c-badge-text",
           "leading_diamond": " \uE0B6",
           "style": "diamond",
-          "template": "{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uE0B1 \uF448 ({{ .Working.String }}){{ end }}{{ if and .Working.Changed .Staging.Changed }} \uE621 {{ end }}{{ if .Staging.Changed }}{{ if not .Working.Changed }} \uE0B1 {{ end }}\uF854 ({{ .Staging.String }}){{ end }}{{ if .StashCount }} \uE621 \uF6FC {{ .StashCount }} Stash{{ if gt .StashCount 1 }}es{{ end }}{{ end }}",
+          "template": "{{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }} \uE0B1 \uF448 ({{ .Working.String }}){{ end }}{{ if and .Working.Changed .Staging.Changed }} \uE0B1 {{ end }}{{ if .Staging.Changed }}{{ if not .Working.Changed }} \uf15c {{ end }}\uf15c ({{ .Staging.String }}){{ end }}{{ if .StashCount }} \ueb4b {{ .StashCount }} Stash{{ if gt .StashCount 1 }}es{{ end }}{{ end }}",
           "properties": {
             "branch_icon": "\uE0A0 ",
-            "branch_ahead_icon": " \uE621 \uF9AC ",
-            "branch_behind_icon": " \uE621 \uF9AD ",
-            "branch_gone_icon": " \uE621 \uF00D",
-            "branch_identical_icon": " \uE621 \uF00C",
             "fetch_status": true,
             "fetch_stash_count": true
           },
@@ -108,7 +104,7 @@
             "time_format": "15:04 (01/02)"
           },
           "style": "diamond",
-          "template": "{{ if eq \"False\" (title (default \"False\" .Env.DISABLE_SEGMENT_DTIME)) }}\uF5EF {{ .CurrentDate | date .Format }}{{ end }}",
+          "template": "{{ if eq \"False\" (title (default \"False\" .Env.DISABLE_SEGMENT_DTIME)) }}\uf43a {{ .CurrentDate | date .Format }}{{ end }}",
           "trailing_diamond": "\uE0B4 ",
           "type": "time"
         },

diff --git a/themes/glowsticks.omp.yaml b/themes/glowsticks.omp.yaml
@@ -66,7 +66,7 @@ blocks:
         style: diamond
         template: " {{ if gt .Code 0 }} {{ reason .Code }}{{ else }}{{ end }} "
         trailing_diamond: 
-        type: exit
+        type: status
     type: prompt
   - alignment: right
     segments:

diff --git a/themes/if_tea.omp.json b/themes/if_tea.omp.json
@@ -132,7 +132,7 @@
           "properties": {
             "folder_icon": "\uf07b ",
             "folder_separator_icon": " \uf061 ",
-            "home_icon": " ",
+            "home_icon": "\uf46d",
             "style": "agnoster_full",
             "template": " \ue5ff {{ .Path }} "
           },

diff --git a/themes/jonnychipz.omp.json b/themes/jonnychipz.omp.json
@@ -23,8 +23,8 @@
         {
           "background": "#1a1af5",
           "foreground": "#ffffff",
-          "powerline_symbol": "\ue0b0",
-          "style": "powerline",
+          "trailing_diamond": "\ue0b0",
+          "style": "diamond",
           "template": " \uebd8 {{ .Name }} ",
           "type": "az"
         },
@@ -38,7 +38,8 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": "<transparent>\ue0b0</>\ue23a ",
+          "template": " \ue23a ",
+          "leading_diamond": "<transparent>\ue0b0</>",
           "trailing_diamond": "\ue0b4",
           "type": "status"
         }

diff --git a/themes/json.omp.json b/themes/json.omp.json
@@ -10,7 +10,7 @@
             "style": "folder"
           },
           "style": "diamond",
-          "template": "<#42E66C>\u2B22 </><b>{{ .Path }}</b>",
+          "template": "<#42E66C>\ueaf7 </><b>{{ .Path }}</b>",
           "type": "path"
         },
         {
@@ -36,7 +36,7 @@
       "newline": true,
       "segments": [
         {
-          "foreground": "#000000",
+          "foreground": "#FFFFFF",
           "style": "plain",
           "template": ">",
           "type": "text"

diff --git a/themes/kali.omp.json b/themes/kali.omp.json
@@ -67,7 +67,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": " {{ if gt .Code 0 }}\u2a2f{{else}}\u2713{{ end }} ",
+          "template": " {{ if gt .Code 0 }}\uea76{{else}}\uf42e{{ end }} ",
           "type": "status"
         }
       ],

diff --git a/themes/lightgreen.omp.json b/themes/lightgreen.omp.json
@@ -12,7 +12,7 @@
           "type": "root"
         },
         {
-          "background": "#000000",
+          "background": "transparent",
           "foreground": "#ffffff",
           "properties": {
             "alpine": "\uf300",

diff --git a/themes/neko.omp.json b/themes/neko.omp.json
@@ -65,4 +65,4 @@
 			}
     ],
     "version": 2
-  }
+  }
diff --git a/themes/night-owl.omp.json b/themes/night-owl.omp.json
@@ -120,7 +120,7 @@
           "foreground": "#337bb6",
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": "\uFD03 {{ .EnvironmentName }} ",
+          "template": "\uebd8 {{ .EnvironmentName }} ",
           "trailing_diamond": "<transparent,#ffffff>\ue0b2</>",
           "type": "az"
         },

diff --git a/themes/pixelrobots.omp.json b/themes/pixelrobots.omp.json
@@ -124,7 +124,7 @@
             "fetch_upstream_icon": true
           },
           "style": "diamond",
-          "template": "<#ffea00>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#ffea00>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \ueb4b {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -153,4 +153,4 @@
   "console_title_template": "{{if .Root}}root :: {{end}}{{.Shell}} :: {{.Folder}}",
   "final_space": true,
   "version": 2
-}
+}
diff --git a/themes/powerlevel10k_rainbow.omp.json b/themes/powerlevel10k_rainbow.omp.json
@@ -170,7 +170,7 @@
             "always_enabled": true
           },
           "style": "powerline",
-          "template": " {{ if gt .Code 0 }}{{ reason .Code }}{{ else }}\u2714{{ end }} ",
+          "template": " {{ if gt .Code 0 }}{{ reason .Code }}{{ else }}\uf42e{{ end }} ",
           "type": "status"
         },
         {

diff --git a/themes/smoothie.omp.json b/themes/smoothie.omp.json
@@ -14,8 +14,8 @@
         {
           "foreground": "#ffaed8",
           "properties": {
-            "folder_separator_icon": " 🢖 ",
-            "home_icon": "\u2764",
+            "folder_separator_icon": " | ",
+            "home_icon": "\uf46d",
             "style": "letter"
           },
           "style": "plain",
@@ -25,7 +25,7 @@
         {
           "foreground": "#62beff",
           "properties": {
-            "branch_icon": "\u27df",
+            "branch_icon": "\uf418",
             "branch_identical_icon": "\u2261",
             "fetch_status": true
           },

diff --git a/website/docs/segments/az.mdx b/website/docs/segments/az.mdx
@@ -24,7 +24,7 @@ import Config from '@site/src/components/Config.js';
   "powerline_symbol": "\uE0B0",
   "foreground": "#000000",
   "background": "#9ec3f0",
-  "template": " \uFD03 {{ .EnvironmentName }}"
+  "template": " \uebd8 {{ .EnvironmentName }}"
 }}/>
 
 ## Properties
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,4 +65,4 @@ @@
     			}
         ],
         "version": 2
-      }
+      }