Fixes for Tokyo Theme

[0-0-1-0-1-0-1-0]

Code of Conduct

• I agree to follow this project's Code of Conduct

What happened?

Theres a bug with the formatting, I fixed it for myself, but not exactly sure how to do the PR here. So ill provide the code and let you decide if it should be updated.

{
  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
  "blocks": [
    {
      "alignment": "left",
      "leading_diamond": "<#7eb8da>\u250f</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "properties": {
            "time_format": "01/02/2006 @ 3:04:05 PM MST"
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf073</> {{ .CurrentDate | date .Format }}]",
          "type": "time"
        },
        {
          "foreground": "#7eb8da",
          "style": "plain",
          "template": "[<#ffffff>\ueb99</> {{ .UserName }} :: <#ffffff>\uf108</> {{ .HostName }}]",
          "type": "session"
        },
        {
          "foreground": "#be9ddf",
          "style": "diamond",
          "template": "[<#ffffff>\ue266</> RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalAvailableMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB]",
          "type": "sysinfo"
        },
        {
          "foreground": "#f36943",
          "foreground_templates": [
            "{{if eq \"Charging\" .State.String}}#40c4ff{{end}}",
            "{{if eq \"Discharging\" .State.String}}#ff5722{{end}}",
            "{{if eq \"Full\" .State.String}}#4caf50{{end}}"
          ],
          "properties": {
            "charged_icon": "<#ffffff>\ue22f</> ",
            "charging_icon": "\ueb2d ",
            "discharging_icon": "<#ffff00>\uf244</> "
          },
          "style": "plain",
          "template": "[{{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295]",
          "type": "battery"
        },
        {
          "foreground": "#be9ddf",
          "properties": {
            "style": "dallas",
            "threshold": 0
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf252</> {{ .FormattedMs }}s]",
          "type": "executiontime"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "segments": [
        {
          "foreground": "#7eb8da",
          "properties": {
            "style": "full"
          },
          "style": "plain",
          "template": "\u2523[<#ffffff>\uf115</> <#98bfad>{{ .Path }}</>]",
          "type": "path"
        },
        {
          "foreground": "#ffa5d8",
          "properties": {
            "fetch_stash_count": true,
            "fetch_status": true,
            "fetch_upstream_icon": true
          },
          "style": "plain",
          "template": "[<#ffffff>{{ .UpstreamIcon }} </>{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ffffff>\uf044</> {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#ffffff>\uf046</> {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} <#ffffff>\ueb4b</> {{ .StashCount }}{{ end }}]",
          "type": "git"
        },
        {
          "foreground": "#ff0000",
          "style": "plain",
          "template": "[<#ffffff>\uf0e7</> SU]",
          "type": "root"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2514\u2500</>",
      "segments": [
        {
          "style": "diamond",
          "template": ">",
          "type": "text"
        },
        {
          "foreground": "#ffa5d8",
          "style": "powerline",
          "template": "[<#ffffff>\uea6c</> Error, check your command]",
          "type": "status"
        }
      ],
      "type": "prompt"
    }
  ],
  "final_space": true,
  "secondary_prompt": {
    "background": "transparent",
    "template": " "
  },
  "version": 3
}

Theme

Tokyo

What OS are you seeing the problem on?

Windows

Which shell are you using?

powershell

Log output

None

[JanDeDobbeleer]

@0-0-1-0-1-0-1-0 what was the issue and what did you change?

[0-0-1-0-1-0-1-0]

See the screenshot:

Admin/Git/Error message:

Non-Admin/No Error

I provided a comment with two theme files, sameline and original new line versions.

The chevron will also change to a red error glyph and switch back to original if the command has no error.

[0-0-1-0-1-0-1-0]

Ill provide a screenshot later today, however here are the following changes:

The info (first) segment had a duplicate instance of the root node in between the ram and execution time nodes, and another one at the end.

Added battery node after the ram node.

Updated the time format to be more like a time stamp and moved it to be the leading node in the first segment.

Format is: 01/02/2006 @ 3:04:05 PM MST

The path (second) segment had the wrong starting glyph, changed it to "template": "\u2523[<#ffffff>\uf115</> <#98bfad>{{ .Path }}</>]", so that it links with the prompt glyph in the last segment.

Additionally, I moved the GIT node and the root node from the first segment to the second segment after the path node, and adding a bit more clarity to the root node so its clear to see you are running in SU/Admin, this also allows users to modify it down to a sameline prompt format if desired.

Last thing I did was remove the chevron when inputting multilines into the command line, this is primarily for when you write something in the terminal and want to copy it back to a script, you don't have to remove the chevron afterwards.

[0-0-1-0-1-0-1-0]

Oh I forgot one more thing, switched to using leading diamond for each segment, instead of having the leading glyph be set on the first node of each segment.

I did this because in my personal version, i have a third segment for cloud based items like az/azd/gcp/project/ etc

And not in all cases/prompts do I have the third segement or all those items enumerated, so the leading diamond will be set regradless of which node is present or which order:

This segment goes between the first and second (path) segment:

    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2523</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uebd8</> Subscription: <#ffff00>{{ .Name }}</>]",
          "type": "az"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uebd8</> Azure Developer CLI Environment: <#ffff00>{{ .DefaultEnvironment  }}</> :: <#ffff00>{{ .Version }}</>]",
          "type": "azd"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uf270</> <#ffff00>{{ .Profile }}</>{{if .Region}}@<#ffff00>{{ .Region }}</>{{ end }}]",
          "type": "aws"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[{{ if .Error }}{{ .Error }}{{ else }}<#ffffff>\uf1a0</> <#ffff00>{{ .Project }}</> :: <#ffff00>{{.Account}}</>{{ end }}]",
          "type": "gcp"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[<#ffffff>\uf10fe</> <#ffff00>{{.Context}}</>{{if .Namespace}} :: <#ffff00>{{.Namespace}}</>{{end}}]",
          "type": "kubectl"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[{{ if .Error }}{{ .Error }}{{ else }}{{ if .Name }}<#ffffff>\uf487</> {{ .Name }}{{ end }}{{ if .Target }} {{ .Target }}{{ end }}{{ end }}]",
          "type": "project"
        }
      ],
      "type": "prompt"
    },

[0-0-1-0-1-0-1-0]

I'll get screenshots of all the configs I have:

tokyo.omp.json (fixed original)

{
{
  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
  "blocks": [
    {
      "alignment": "left",
      "leading_diamond": "<#7eb8da>\u250f</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "properties": {
            "time_format": "01/02/2006 @ 3:04:05 PM MST"
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf073</> {{ .CurrentDate | date .Format }}]",
          "type": "time"
        },
        {
          "foreground": "#7eb8da",
          "style": "plain",
          "template": "[<#ffffff>\ueb99</> {{ .UserName }} :: <#ffffff>\uf108</> {{ .HostName }}]",
          "type": "session"
        },
        {
          "foreground": "#be9ddf",
          "style": "diamond",
          "template": "[<#ffffff>\ue266</> RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalAvailableMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB]",
          "type": "sysinfo"
        },
        {
          "foreground": "#f36943",
          "foreground_templates": [
            "{{if eq \"Charging\" .State.String}}#40c4ff{{end}}",
            "{{if eq \"Discharging\" .State.String}}#ff5722{{end}}",
            "{{if eq \"Full\" .State.String}}#4caf50{{end}}"
          ],
          "properties": {
            "charged_icon": "<#ffffff>\ue22f</> ",
            "charging_icon": "\ueb2d ",
            "discharging_icon": "<#ffff00>\uf244</> "
          },
          "style": "plain",
          "template": "[{{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295]",
          "type": "battery"
        },
        {
          "foreground": "#be9ddf",
          "properties": {
            "style": "dallas",
            "threshold": 0
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf252</> {{ .FormattedMs }}s]",
          "type": "executiontime"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2523</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uebd8</> Subscription: <#ffff00>{{ .Name }}</>]",
          "type": "az"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uebd8</> Azure Developer CLI Environment: <#ffff00>{{ .DefaultEnvironment  }}</> :: <#ffff00>{{ .Version }}</>]",
          "type": "azd"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uf270</> <#ffff00>{{ .Profile }}</>{{if .Region}}@<#ffff00>{{ .Region }}</>{{ end }}]",
          "type": "aws"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[{{ if .Error }}{{ .Error }}{{ else }}<#ffffff>\uf1a0</> <#ffff00>{{ .Project }}</> :: <#ffff00>{{.Account}}</>{{ end }}]",
          "type": "gcp"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[<#ffffff>\uf10fe</> <#ffff00>{{.Context}}</>{{if .Namespace}} :: <#ffff00>{{.Namespace}}</>{{end}}]",
          "type": "kubectl"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[{{ if .Error }}{{ .Error }}{{ else }}{{ if .Name }}<#ffffff>\uf487</> {{ .Name }}{{ end }}{{ if .Target }} {{ .Target }}{{ end }}{{ end }}]",
          "type": "project"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2523</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "properties": {
            "style": "full"
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf115</> <#98bfad>{{ .Path }}</>]",
          "type": "path"
        },
        {
          "foreground": "#ffa5d8",
          "properties": {
            "fetch_stash_count": true,
            "fetch_status": true,
            "fetch_upstream_icon": true
          },
          "style": "plain",
          "template": "[<#ffffff>{{ .UpstreamIcon }} </>{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ffffff>\uf044</> {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#ffffff>\uf046</> {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} <#ffffff>\ueb4b</> {{ .StashCount }}{{ end }}]",
          "type": "git"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2514\u2500</>",
      "segments": [
        {
          "style": "diamond",
            "template": "<#ffff00>[#]</>",
          "type": "root"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[<#ffffff>\uea6c</> Error, check your command]",
          "type": "status"
        },
        {
          "style": "diamond",
          "template": ">",
          "type": "text"
        }
      ],
      "type": "prompt"
    }
  ],
  "final_space": true,
  "secondary_prompt": {
    "background": "transparent",
    "template": " "
  },
  "valid_line": {
    "background": "transparent",
    "template": "> "
  },
  "error_line": {
    "background": "transparent",
    "template": "<#ff0000>\uea87</> "
  },
  "version": 3
}

tokyo-sameline.omp.json (Same as above just the prompt is on the same line as path)

{
  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
  "blocks": [
    {
      "alignment": "left",
      "leading_diamond": "<#7eb8da>\u250f</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "properties": {
            "time_format": "01/02/2006 @ 3:04:05 PM MST"
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf073</> {{ .CurrentDate | date .Format }}]",
          "type": "time"
        },
        {
          "foreground": "#7eb8da",
          "style": "plain",
          "template": "[<#ffffff>\ueb99</> {{ .UserName }} :: <#ffffff>\uf108</> {{ .HostName }}]",
          "type": "session"
        },
        {
          "foreground": "#be9ddf",
          "style": "diamond",
          "template": "[<#ffffff>\ue266</> RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalAvailableMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB]",
          "type": "sysinfo"
        },
        {
          "foreground": "#f36943",
          "foreground_templates": [
            "{{if eq \"Charging\" .State.String}}#40c4ff{{end}}",
            "{{if eq \"Discharging\" .State.String}}#ff5722{{end}}",
            "{{if eq \"Full\" .State.String}}#4caf50{{end}}"
          ],
          "properties": {
            "charged_icon": "<#ffffff>\ue22f</> ",
            "charging_icon": "\ueb2d ",
            "discharging_icon": "<#ffff00>\uf244</> "
          },
          "style": "plain",
          "template": "[{{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295]",
          "type": "battery"
        },
        {
          "foreground": "#be9ddf",
          "properties": {
            "style": "dallas",
            "threshold": 0
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf252</> {{ .FormattedMs }}s]",
          "type": "executiontime"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2523</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uebd8</> Subscription: <#ffff00>{{ .Name }}</>]",
          "type": "az"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uebd8</> Azure Developer CLI Environment: <#ffff00>{{ .DefaultEnvironment  }}</> :: <#ffff00>{{ .Version }}</>]",
          "type": "azd"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[<#ffffff>\uf270</> <#ffff00>{{ .Profile }}</>{{if .Region}}@<#ffff00>{{ .Region }}</>{{ end }}]",
          "type": "aws"
        },
        {
          "foreground": "#7eb8da",
          "style": "diamond",
          "template": "[{{ if .Error }}{{ .Error }}{{ else }}<#ffffff>\uf1a0</> <#ffff00>{{ .Project }}</> :: <#ffff00>{{.Account}}</>{{ end }}]",
          "type": "gcp"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[<#ffffff>\uf10fe</> <#ffff00>{{.Context}}</>{{if .Namespace}} :: <#ffff00>{{.Namespace}}</>{{end}}]",
          "type": "kubectl"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[{{ if .Error }}{{ .Error }}{{ else }}{{ if .Name }}<#ffffff>\uf487</> {{ .Name }}{{ end }}{{ if .Target }} {{ .Target }}{{ end }}{{ end }}]",
          "type": "project"
        }
      ],
      "type": "prompt"
    },
    {
      "alignment": "left",
      "newline": true,
      "leading_diamond": "<#7eb8da>\u2517</>",
      "segments": [
        {
          "foreground": "#7eb8da",
          "properties": {
            "style": "full"
          },
          "style": "diamond",
          "template": "[<#ffffff>\uf115</> <#98bfad>{{ .Path }}</>]",
          "type": "path"
        },
        {
          "foreground": "#ffa5d8",
          "properties": {
            "fetch_stash_count": true,
            "fetch_status": true,
            "fetch_upstream_icon": true
          },
          "style": "plain",
          "template": "[<#ffffff>{{ .UpstreamIcon }} </>{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ffffff>\uf044</> {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#ffffff>\uf046</> {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} <#ffffff>\ueb4b</> {{ .StashCount }}{{ end }}]",
          "type": "git"
        },
        {
          "style": "diamond",
          "template": "<#ffff00>[#]</>",
          "type": "root"
        },
        {
          "foreground": "#ffa5d8",
          "style": "diamond",
          "template": "[<#ffffff>\uea6c</> Error, check your command]",
          "type": "status"
        },
        {
          "style": "diamond",
          "template": ">",
          "type": "text"
        }
      ],
      "type": "prompt"
    }
  ],
  "final_space": true,
  "secondary_prompt": {
    "background": "transparent",
    "template": " "
  },
  "valid_line": {
    "background": "transparent",
    "template": "> "
  },
  "error_line": {
    "background": "transparent",
    "template": "<#ff0000>\uea87</> "
  },
  "version": 3
}

NOTE I updated my original post with the latest code/fixes. You can use that to see what it looks like.

[0-0-1-0-1-0-1-0]

I see I just did some digging, looks like ill need to fork this repo, then PR from that repo into yours. Ill propose these templates with screenshots today.