From 17f75fa1ff3dd018ac53445f66f63cd08152e320 Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Wed, 7 Sep 2022 07:01:52 +0200 Subject: [PATCH] refactor(git): no leading space on branch status --- src/engine/migrate_test.go | 4 +- src/segments/git.go | 10 +- src/segments/git_test.go | 10 +- src/test/jandedobbeleer-palette.omp.json | 2 +- src/test/jandedobbeleer.omp.json | 2 +- themes/1_shell.omp.json | 2 +- themes/atomic.omp.json | 2 +- themes/bubblesextra.omp.json | 2 +- themes/chips.omp.json | 2 +- themes/clean-detailed.omp.json | 2 +- themes/cloud-native-azure.omp.json | 2 +- themes/default.omp.json | 2 +- themes/devious-diamonds.omp.yaml | 2 +- themes/di4am0nd.omp.json | 2 +- themes/easy-term.omp.json | 4 +- themes/emodipt-extend.omp.json | 234 ++++++++++---------- themes/free-ukraine.omp.json | 2 +- themes/gruvbox.omp.json | 270 +++++++++++------------ themes/if_tea.omp.json | 2 +- themes/jandedobbeleer.omp.json | 2 +- themes/jv_sitecorian.omp.json | 2 +- themes/kushal.omp.json | 2 +- themes/larserikfinholt.omp.json | 2 +- themes/marcduiker.omp.json | 2 +- themes/markbull.omp.json | 2 +- themes/mojada.omp.json | 2 +- themes/multiverse-neon.omp.json | 6 +- themes/negligible.omp.json | 2 +- themes/night-owl.omp.json | 2 +- themes/nordtron.omp.json | 2 +- themes/patriksvensson.omp.json | 2 +- themes/peru.omp.json | 2 +- themes/pixelrobots.omp.json | 2 +- themes/poshmon.omp.json | 2 +- themes/powerlevel10k_rainbow.omp.json | 2 +- themes/pure.omp.json | 2 +- themes/rudolfs-dark.omp.json | 2 +- themes/rudolfs-light.omp.json | 2 +- themes/slim.omp.json | 2 +- themes/slimfat.omp.json | 2 +- themes/smoothie.omp.json | 2 +- themes/star.omp.json | 2 +- themes/stelbent-compact.minimal.omp.json | 2 +- themes/stelbent.minimal.omp.json | 2 +- themes/the-unnamed.omp.json | 2 +- themes/thecyberden.omp.json | 2 +- themes/tokyo.omp.json | 2 +- themes/unicorn.omp.json | 2 +- themes/velvet.omp.json | 2 +- themes/wholespace.json | 2 +- website/docs/configuration/example.mdx | 6 +- website/docs/segments/git.mdx | 4 +- 52 files changed, 317 insertions(+), 317 deletions(-) diff --git a/src/engine/migrate_test.go b/src/engine/migrate_test.go index 0cd90db6..df4dbae3 100644 --- a/src/engine/migrate_test.go +++ b/src/engine/migrate_test.go @@ -195,7 +195,7 @@ func TestSegmentTemplateMigration(t *testing.T) { }{ { Case: "GIT", - Expected: " {{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }} working {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} and{{ end }}{{ if .Staging.Changed }} staged {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} stash {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} worktree {{ .WorktreeCount }}{{ end }} ", //nolint: lll + Expected: " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} working {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} and{{ end }}{{ if .Staging.Changed }} staged {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} stash {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} worktree {{ .WorktreeCount }}{{ end }} ", //nolint: lll Type: GIT, Props: properties.Map{ "local_working_icon": " working ", @@ -207,7 +207,7 @@ func TestSegmentTemplateMigration(t *testing.T) { }, { Case: "GIT - Staging and Working Color", - Expected: " {{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }} working <#123456>{{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} and{{ end }}{{ if .Staging.Changed }} staged <#123456>{{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} stash {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} worktree {{ .WorktreeCount }}{{ end }} ", //nolint: lll + Expected: " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} working <#123456>{{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} and{{ end }}{{ if .Staging.Changed }} staged <#123456>{{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} stash {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} worktree {{ .WorktreeCount }}{{ end }} ", //nolint: lll Type: GIT, Props: properties.Map{ "local_working_icon": " working ", diff --git a/src/segments/git.go b/src/segments/git.go index e88fa409..1215790e 100644 --- a/src/segments/git.go +++ b/src/segments/git.go @@ -244,19 +244,19 @@ func (g *Git) hasWorktree(gitdir *environment.FileInfo) bool { func (g *Git) setBranchStatus() { getBranchStatus := func() string { if g.Ahead > 0 && g.Behind > 0 { - return fmt.Sprintf(" %s%d %s%d", g.props.GetString(BranchAheadIcon, "\u2191"), g.Ahead, g.props.GetString(BranchBehindIcon, "\u2193"), g.Behind) + return fmt.Sprintf("%s%d %s%d", g.props.GetString(BranchAheadIcon, "\u2191"), g.Ahead, g.props.GetString(BranchBehindIcon, "\u2193"), g.Behind) } if g.Ahead > 0 { - return fmt.Sprintf(" %s%d", g.props.GetString(BranchAheadIcon, "\u2191"), g.Ahead) + return fmt.Sprintf("%s%d", g.props.GetString(BranchAheadIcon, "\u2191"), g.Ahead) } if g.Behind > 0 { - return fmt.Sprintf(" %s%d", g.props.GetString(BranchBehindIcon, "\u2193"), g.Behind) + return fmt.Sprintf("%s%d", g.props.GetString(BranchBehindIcon, "\u2193"), g.Behind) } if g.UpstreamGone { - return fmt.Sprintf(" %s", g.props.GetString(BranchGoneIcon, "\u2262")) + return g.props.GetString(BranchGoneIcon, "\u2262") } if g.Behind == 0 && g.Ahead == 0 && g.Upstream != "" { - return fmt.Sprintf(" %s", g.props.GetString(BranchIdenticalIcon, "\u2261")) + return g.props.GetString(BranchIdenticalIcon, "\u2261") } return "" } diff --git a/src/segments/git_test.go b/src/segments/git_test.go index fb0107c8..8a1036f5 100644 --- a/src/segments/git_test.go +++ b/src/segments/git_test.go @@ -564,11 +564,11 @@ func TestGetBranchStatus(t *testing.T) { Upstream string UpstreamGone bool }{ - {Case: "Equal with remote", Expected: " equal", Upstream: branchName}, - {Case: "Ahead", Expected: " up2", Ahead: 2}, - {Case: "Behind", Expected: " down8", Behind: 8}, - {Case: "Behind and ahead", Expected: " up7 down8", Behind: 8, Ahead: 7}, - {Case: "Gone", Expected: " gone", Upstream: branchName, UpstreamGone: true}, + {Case: "Equal with remote", Expected: "equal", Upstream: branchName}, + {Case: "Ahead", Expected: "up2", Ahead: 2}, + {Case: "Behind", Expected: "down8", Behind: 8}, + {Case: "Behind and ahead", Expected: "up7 down8", Behind: 8, Ahead: 7}, + {Case: "Gone", Expected: "gone", Upstream: branchName, UpstreamGone: true}, {Case: "No remote", Expected: "", Upstream: ""}, {Case: "Default (bug)", Expected: "", Behind: -8, Upstream: "wonky"}, } diff --git a/src/test/jandedobbeleer-palette.omp.json b/src/test/jandedobbeleer-palette.omp.json index 7031e453..518766ee 100644 --- a/src/test/jandedobbeleer-palette.omp.json +++ b/src/test/jandedobbeleer-palette.omp.json @@ -44,7 +44,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b4", "type": "git" }, diff --git a/src/test/jandedobbeleer.omp.json b/src/test/jandedobbeleer.omp.json index d82e3488..f8277b19 100644 --- a/src/test/jandedobbeleer.omp.json +++ b/src/test/jandedobbeleer.omp.json @@ -44,7 +44,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b4", "type": "git" }, diff --git a/themes/1_shell.omp.json b/themes/1_shell.omp.json index 069084ce..d3b4a893 100644 --- a/themes/1_shell.omp.json +++ b/themes/1_shell.omp.json @@ -34,7 +34,7 @@ "fetch_worktree_count": true }, "style": "diamond", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" } ], diff --git a/themes/atomic.omp.json b/themes/atomic.omp.json index 0a461a54..2e7bdc69 100644 --- a/themes/atomic.omp.json +++ b/themes/atomic.omp.json @@ -48,7 +48,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#ef5350> \uf046 {{ .Staging.String }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#ef5350> \uf046 {{ .Staging.String }}{{ end }} ", "type": "git" }, { diff --git a/themes/bubblesextra.omp.json b/themes/bubblesextra.omp.json index b1fdf859..bf6ea534 100644 --- a/themes/bubblesextra.omp.json +++ b/themes/bubblesextra.omp.json @@ -33,7 +33,7 @@ "fetch_upstream_icon": true }, "style": "diamond", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b4", "type": "git" }, diff --git a/themes/chips.omp.json b/themes/chips.omp.json index 1aae15f2..7fe6a90c 100644 --- a/themes/chips.omp.json +++ b/themes/chips.omp.json @@ -30,7 +30,7 @@ "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 }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ 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 }}", "properties": { "branch_icon": "\uE0A0 ", "branch_ahead_icon": "\uE621 \uF9AC ", diff --git a/themes/clean-detailed.omp.json b/themes/clean-detailed.omp.json index fe0012b8..4803c20e 100644 --- a/themes/clean-detailed.omp.json +++ b/themes/clean-detailed.omp.json @@ -75,7 +75,7 @@ "fetch_worktree_count": true }, "style": "diamond", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b0", "type": "git" } diff --git a/themes/cloud-native-azure.omp.json b/themes/cloud-native-azure.omp.json index 0f603397..5b99e7f4 100644 --- a/themes/cloud-native-azure.omp.json +++ b/themes/cloud-native-azure.omp.json @@ -40,7 +40,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/default.omp.json b/themes/default.omp.json index b2a740ee..a9f03ac0 100644 --- a/themes/default.omp.json +++ b/themes/default.omp.json @@ -50,7 +50,7 @@ "github_icon": "\uf7a3" }, "style": "powerline", - "template": " {{ if .UpstreamURL }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", + "template": " {{ if .UpstreamURL }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", "type": "git" }, { diff --git a/themes/devious-diamonds.omp.yaml b/themes/devious-diamonds.omp.yaml index 0040feef..00e8895e 100644 --- a/themes/devious-diamonds.omp.yaml +++ b/themes/devious-diamonds.omp.yaml @@ -174,7 +174,7 @@ blocks: fetch_status: true fetch_upstream_icon: true fetch_worktree_count: true - template: "{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}" + template: "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}" - type: prompt alignment: left newline: true diff --git a/themes/di4am0nd.omp.json b/themes/di4am0nd.omp.json index df5597fc..49bee834 100644 --- a/themes/di4am0nd.omp.json +++ b/themes/di4am0nd.omp.json @@ -25,7 +25,7 @@ "fetch_status": true }, "style": "plain", - "template": "<#ffffff>on {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", + "template": "<#ffffff>on {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", "type": "git" }, { diff --git a/themes/easy-term.omp.json b/themes/easy-term.omp.json index 600bd952..a7fbc16e 100644 --- a/themes/easy-term.omp.json +++ b/themes/easy-term.omp.json @@ -66,7 +66,7 @@ "fetch_status": true, "fetch_upstream_icon": true }, - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b4", "type": "git" } @@ -153,4 +153,4 @@ ], "final_space": true, "version": 2 -} \ No newline at end of file +} diff --git a/themes/emodipt-extend.omp.json b/themes/emodipt-extend.omp.json index 1eb9bacc..389362ad 100644 --- a/themes/emodipt-extend.omp.json +++ b/themes/emodipt-extend.omp.json @@ -1,117 +1,117 @@ -{ - "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", - "blocks": [ - { - "alignment": "left", - "segments": [ - { - "foreground": "#E5C07B", - "properties": { - "time_format": "15:04" - }, - "style": "plain", - "template": "[{{ .CurrentDate | date .Format }}]", - "type": "time" - }, - { - "type": "shell", - "style": "plain", - "foreground": "#E06C75", - "properties": { - "mapped_shell_names": { - "pwsh": "Shell", - "powershell": "Shell", - "cmd": "Cmd", - "bash": "Bash" - } - }, - "template": " \ue795 {{ .Name }}" - }, - { - "foreground": "#F3C267", - "foreground_templates": [ - "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}", - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}", - "{{ if gt .Ahead 0 }}#B388FF{{ end }}", - "{{ if gt .Behind 0 }}#B388FF{{ end }}" - ], - "properties": { - "branch_max_length": 25, - "fetch_stash_count": true, - "fetch_status": true, - "fetch_upstream_icon": true - }, - "style": "plain", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", - "type": "git" - } - ], - "type": "prompt" - }, - { - "alignment": "right", - "segments": [ - { - "type": "exit", - "style": "plain", - "foreground": "#b8ff75", - "foreground_templates": [ - "{{ if gt .Code 0 }}#E06C75{{ end }}" - ], - "template": " x{{ .Meaning }}" - }, - { - "foreground": "#b8ff75", - "foreground_templates": [ - "{{ if gt .Code 0 }}#E06C75{{ end }}" - ], - "properties": { - "style": "roundrock", - "always_enabled": true - }, - "style": "diamond", - "template": " {{ .FormattedMs }} ", - "type": "executiontime" - } - ], - "type": "prompt" - }, - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#61AFEF", - "properties": { - "style": "full" - }, - "style": "plain", - "template": "\ue5ff {{ .Path }}", - "type": "path" - } - ], - "type": "prompt" - }, - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#E06C75", - "style": "plain", - "template": "\u0021", - "type": "root" - }, - { - "foreground": "#E06C75", - "style": "plain", - "template": "\u276f", - "type": "text" - } - ], - "type": "prompt" - } - ], - "final_space": true, - "version": 2 - } +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "blocks": [ + { + "alignment": "left", + "segments": [ + { + "foreground": "#E5C07B", + "properties": { + "time_format": "15:04" + }, + "style": "plain", + "template": "[{{ .CurrentDate | date .Format }}]", + "type": "time" + }, + { + "type": "shell", + "style": "plain", + "foreground": "#E06C75", + "properties": { + "mapped_shell_names": { + "pwsh": "Shell", + "powershell": "Shell", + "cmd": "Cmd", + "bash": "Bash" + } + }, + "template": " \ue795 {{ .Name }}" + }, + { + "foreground": "#F3C267", + "foreground_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}", + "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}", + "{{ if gt .Ahead 0 }}#B388FF{{ end }}", + "{{ if gt .Behind 0 }}#B388FF{{ end }}" + ], + "properties": { + "branch_max_length": 25, + "fetch_stash_count": true, + "fetch_status": true, + "fetch_upstream_icon": true + }, + "style": "plain", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "type": "git" + } + ], + "type": "prompt" + }, + { + "alignment": "right", + "segments": [ + { + "type": "exit", + "style": "plain", + "foreground": "#b8ff75", + "foreground_templates": [ + "{{ if gt .Code 0 }}#E06C75{{ end }}" + ], + "template": " x{{ .Meaning }}" + }, + { + "foreground": "#b8ff75", + "foreground_templates": [ + "{{ if gt .Code 0 }}#E06C75{{ end }}" + ], + "properties": { + "style": "roundrock", + "always_enabled": true + }, + "style": "diamond", + "template": " {{ .FormattedMs }} ", + "type": "executiontime" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#61AFEF", + "properties": { + "style": "full" + }, + "style": "plain", + "template": "\ue5ff {{ .Path }}", + "type": "path" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#E06C75", + "style": "plain", + "template": "\u0021", + "type": "root" + }, + { + "foreground": "#E06C75", + "style": "plain", + "template": "\u276f", + "type": "text" + } + ], + "type": "prompt" + } + ], + "final_space": true, + "version": 2 + } diff --git a/themes/free-ukraine.omp.json b/themes/free-ukraine.omp.json index 726b27a7..6b79d8c3 100644 --- a/themes/free-ukraine.omp.json +++ b/themes/free-ukraine.omp.json @@ -52,7 +52,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " \uf1d3 {{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}}\uf692 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }} ", + "template": " \uf1d3 {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}}\uf692 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/gruvbox.omp.json b/themes/gruvbox.omp.json index cafe2627..9013c925 100644 --- a/themes/gruvbox.omp.json +++ b/themes/gruvbox.omp.json @@ -1,135 +1,135 @@ -{ - "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", - "blocks": [ - { - "alignment": "left", - "segments": [ - { - "background": "#3A3A3A", - "foreground": "#ffffff", - "style": "powerline", - "template": "{{ if .WSL }}WSL at{{ end }} {{.Icon}} ", - "type": "os" - }, - { - "background": "#458588", - "foreground": "#282828", - "powerline_symbol": "\ue0b0", - "properties": { - "style": "full" - }, - "style": "powerline", - "template": " {{ .Path }} ", - "type": "path" - }, - { - "background": "#98971A", - "background_templates": [ - "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}", - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}", - "{{ if gt .Ahead 0 }}#B388FF{{ end }}", - "{{ if gt .Behind 0 }}#B388FF{{ end }}" - ], - "foreground": "#282828", - "leading_diamond": "\ue0b6", - "powerline_symbol": "\ue0b0", - "properties": { - "branch_max_length": 25, - "fetch_stash_count": true, - "fetch_status": true, - "branch_icon": "\uE0A0 ", - "branch_identical_icon": "\u25CF" - }, - "style": "powerline", - "template": " {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", - "trailing_diamond": "\ue0b4", - "type": "git" - }, - { - "background": "#8ED1F7", - "foreground": "#111111", - "powerline_symbol": "\ue0b0", - "properties": { - "fetch_version": true - }, - "style": "powerline", - "template": " \ue626 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", - "type": "go" - }, - { - "background": "#4063D8", - "foreground": "#111111", - "powerline_symbol": "\ue0b0", - "properties": { - "fetch_version": true - }, - "style": "powerline", - "template": " \ue624 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", - "type": "julia" - }, - { - "background": "#FFDE57", - "foreground": "#111111", - "powerline_symbol": "\ue0b0", - "properties": { - "display_mode": "files", - "fetch_virtual_env": false - }, - "style": "powerline", - "template": " \ue235 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", - "type": "python" - }, - { - "background": "#AE1401", - "foreground": "#ffffff", - "powerline_symbol": "\ue0b0", - "properties": { - "display_mode": "files", - "fetch_version": true - }, - "style": "powerline", - "template": " \ue791 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", - "type": "ruby" - }, - { - "background": "#FEAC19", - "foreground": "#ffffff", - "powerline_symbol": "\ue0b0", - "properties": { - "display_mode": "files", - "fetch_version": false - }, - "style": "powerline", - "template": " \uf0e7{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", - "type": "azfunc" - }, - { - "background_templates": [ - "{{if contains \"default\" .Profile}}#FFA400{{end}}", - "{{if contains \"jan\" .Profile}}#f1184c{{end}}" - ], - "foreground": "#ffffff", - "powerline_symbol": "\ue0b0", - "properties": { - "display_default": false - }, - "style": "powerline", - "template": " \ue7ad {{ .Profile }}{{ if .Region }}@{{ .Region }}{{ end }} ", - "type": "aws" - }, - { - "background": "#ffff66", - "foreground": "#111111", - "powerline_symbol": "\ue0b0", - "style": "powerline", - "template": " \uf0ad ", - "type": "root" - } - ], - "type": "prompt" - } - ], - "console_title_template": "{{ .Folder }}", - "final_space": true, - "version": 2 -} +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "blocks": [ + { + "alignment": "left", + "segments": [ + { + "background": "#3A3A3A", + "foreground": "#ffffff", + "style": "powerline", + "template": "{{ if .WSL }}WSL at{{ end }} {{.Icon}} ", + "type": "os" + }, + { + "background": "#458588", + "foreground": "#282828", + "powerline_symbol": "\ue0b0", + "properties": { + "style": "full" + }, + "style": "powerline", + "template": " {{ .Path }} ", + "type": "path" + }, + { + "background": "#98971A", + "background_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}", + "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}", + "{{ if gt .Ahead 0 }}#B388FF{{ end }}", + "{{ if gt .Behind 0 }}#B388FF{{ end }}" + ], + "foreground": "#282828", + "leading_diamond": "\ue0b6", + "powerline_symbol": "\ue0b0", + "properties": { + "branch_max_length": 25, + "fetch_stash_count": true, + "fetch_status": true, + "branch_icon": "\uE0A0 ", + "branch_identical_icon": "\u25CF" + }, + "style": "powerline", + "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "trailing_diamond": "\ue0b4", + "type": "git" + }, + { + "background": "#8ED1F7", + "foreground": "#111111", + "powerline_symbol": "\ue0b0", + "properties": { + "fetch_version": true + }, + "style": "powerline", + "template": " \ue626 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", + "type": "go" + }, + { + "background": "#4063D8", + "foreground": "#111111", + "powerline_symbol": "\ue0b0", + "properties": { + "fetch_version": true + }, + "style": "powerline", + "template": " \ue624 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", + "type": "julia" + }, + { + "background": "#FFDE57", + "foreground": "#111111", + "powerline_symbol": "\ue0b0", + "properties": { + "display_mode": "files", + "fetch_virtual_env": false + }, + "style": "powerline", + "template": " \ue235 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", + "type": "python" + }, + { + "background": "#AE1401", + "foreground": "#ffffff", + "powerline_symbol": "\ue0b0", + "properties": { + "display_mode": "files", + "fetch_version": true + }, + "style": "powerline", + "template": " \ue791 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", + "type": "ruby" + }, + { + "background": "#FEAC19", + "foreground": "#ffffff", + "powerline_symbol": "\ue0b0", + "properties": { + "display_mode": "files", + "fetch_version": false + }, + "style": "powerline", + "template": " \uf0e7{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", + "type": "azfunc" + }, + { + "background_templates": [ + "{{if contains \"default\" .Profile}}#FFA400{{end}}", + "{{if contains \"jan\" .Profile}}#f1184c{{end}}" + ], + "foreground": "#ffffff", + "powerline_symbol": "\ue0b0", + "properties": { + "display_default": false + }, + "style": "powerline", + "template": " \ue7ad {{ .Profile }}{{ if .Region }}@{{ .Region }}{{ end }} ", + "type": "aws" + }, + { + "background": "#ffff66", + "foreground": "#111111", + "powerline_symbol": "\ue0b0", + "style": "powerline", + "template": " \uf0ad ", + "type": "root" + } + ], + "type": "prompt" + } + ], + "console_title_template": "{{ .Folder }}", + "final_space": true, + "version": 2 +} diff --git a/themes/if_tea.omp.json b/themes/if_tea.omp.json index 781bd3ce..a1f9247a 100644 --- a/themes/if_tea.omp.json +++ b/themes/if_tea.omp.json @@ -79,7 +79,7 @@ "fetch_worktree_count": true }, "style": "diamond", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b0", "type": "git" } diff --git a/themes/jandedobbeleer.omp.json b/themes/jandedobbeleer.omp.json index d82e3488..f8277b19 100644 --- a/themes/jandedobbeleer.omp.json +++ b/themes/jandedobbeleer.omp.json @@ -44,7 +44,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b4", "type": "git" }, diff --git a/themes/jv_sitecorian.omp.json b/themes/jv_sitecorian.omp.json index 888f2189..b85faa86 100644 --- a/themes/jv_sitecorian.omp.json +++ b/themes/jv_sitecorian.omp.json @@ -51,7 +51,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/kushal.omp.json b/themes/kushal.omp.json index 36aca341..8580762d 100644 --- a/themes/kushal.omp.json +++ b/themes/kushal.omp.json @@ -72,7 +72,7 @@ "fetch_worktree_count": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#CAEBE1> \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#CAEBE1> \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" } ], diff --git a/themes/larserikfinholt.omp.json b/themes/larserikfinholt.omp.json index 562bbb13..e39d56a6 100644 --- a/themes/larserikfinholt.omp.json +++ b/themes/larserikfinholt.omp.json @@ -43,7 +43,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/marcduiker.omp.json b/themes/marcduiker.omp.json index 85c13dc3..2de40e78 100644 --- a/themes/marcduiker.omp.json +++ b/themes/marcduiker.omp.json @@ -33,7 +33,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/markbull.omp.json b/themes/markbull.omp.json index 5014b51f..6eeee9b4 100644 --- a/themes/markbull.omp.json +++ b/themes/markbull.omp.json @@ -68,7 +68,7 @@ "tag_icon": "\uf412 " }, "style": "powerline", - "template": " {{ if( .UpstreamIcon ) }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} <#ed1941>\uf044 {{.Working.String}}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#225a1f>\uf046 {{.Staging.String}}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{.StashCount}}{{ end }}{{ if gt .WorktreeCount 0 }}{{if .IsWorkTree}}<#1d953f>{{ end }} \uf1bb {{if .IsWorkTree}}{{ end }}{{.WorktreeCount}}{{ end }} ", + "template": " {{ if( .UpstreamIcon ) }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ed1941>\uf044 {{.Working.String}}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#225a1f>\uf046 {{.Staging.String}}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{.StashCount}}{{ end }}{{ if gt .WorktreeCount 0 }}{{if .IsWorkTree}}<#1d953f>{{ end }} \uf1bb {{if .IsWorkTree}}{{ end }}{{.WorktreeCount}}{{ end }} ", "type": "git" }, { diff --git a/themes/mojada.omp.json b/themes/mojada.omp.json index 3682eb8f..2668c250 100644 --- a/themes/mojada.omp.json +++ b/themes/mojada.omp.json @@ -73,7 +73,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/multiverse-neon.omp.json b/themes/multiverse-neon.omp.json index 937a1961..b80e653a 100644 --- a/themes/multiverse-neon.omp.json +++ b/themes/multiverse-neon.omp.json @@ -33,11 +33,11 @@ "fetch_upstream_icon": true }, "style": "diamond", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b4", "type": "git" }, - + { "foreground": "#C94A16", "style": "plain", @@ -50,7 +50,7 @@ { "alignment": "right", "segments": [ - + { "foreground": "#5fb157", "properties": { diff --git a/themes/negligible.omp.json b/themes/negligible.omp.json index 7495312e..1df4ea64 100644 --- a/themes/negligible.omp.json +++ b/themes/negligible.omp.json @@ -25,7 +25,7 @@ "fetch_status": true }, "style": "plain", - "template": ":: {{ .HEAD }}{{ .BranchStatus }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }} ", + "template": ":: {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }} ", "type": "git" } ], diff --git a/themes/night-owl.omp.json b/themes/night-owl.omp.json index a832a62e..dbf2e6ed 100644 --- a/themes/night-owl.omp.json +++ b/themes/night-owl.omp.json @@ -58,7 +58,7 @@ "fetch_worktree_count": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/nordtron.omp.json b/themes/nordtron.omp.json index a3424a9d..7c4e47f3 100644 --- a/themes/nordtron.omp.json +++ b/themes/nordtron.omp.json @@ -18,7 +18,7 @@ "fetch_upstream_icon": true }, "style": "plain", - "template": "<#5e81ac>--[{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }}<#8fbcbb> \u25cf {{ end }}{{ if .Staging.Changed }}<#88c0d0> \u25cf {{ end }}<#5e81ac>]", + "template": "<#5e81ac>--[{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#8fbcbb> \u25cf {{ end }}{{ if .Staging.Changed }}<#88c0d0> \u25cf {{ end }}<#5e81ac>]", "type": "git" }, { diff --git a/themes/patriksvensson.omp.json b/themes/patriksvensson.omp.json index 1bf1e7cc..f722b725 100644 --- a/themes/patriksvensson.omp.json +++ b/themes/patriksvensson.omp.json @@ -39,7 +39,7 @@ "github_icon": "\uf408 " }, "style": "plain", - "template": " on {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}", + "template": " on {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}", "type": "git" }, { diff --git a/themes/peru.omp.json b/themes/peru.omp.json index ce7425c1..6433d47b 100644 --- a/themes/peru.omp.json +++ b/themes/peru.omp.json @@ -34,7 +34,7 @@ "fetch_upstream_icon": true }, "style": "plain", - "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" } ], diff --git a/themes/pixelrobots.omp.json b/themes/pixelrobots.omp.json index fb5c20f5..21b0c998 100644 --- a/themes/pixelrobots.omp.json +++ b/themes/pixelrobots.omp.json @@ -113,7 +113,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 }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ 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 }} ", "type": "git" }, { diff --git a/themes/poshmon.omp.json b/themes/poshmon.omp.json index 8b8d84ae..6ff0adcc 100644 --- a/themes/poshmon.omp.json +++ b/themes/poshmon.omp.json @@ -43,7 +43,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " \uf113 {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " \uf113 {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" } ], diff --git a/themes/powerlevel10k_rainbow.omp.json b/themes/powerlevel10k_rainbow.omp.json index b8f7ef8f..c6679bee 100644 --- a/themes/powerlevel10k_rainbow.omp.json +++ b/themes/powerlevel10k_rainbow.omp.json @@ -41,7 +41,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" } ], diff --git a/themes/pure.omp.json b/themes/pure.omp.json index 66d69fdf..1d363b4a 100644 --- a/themes/pure.omp.json +++ b/themes/pure.omp.json @@ -37,7 +37,7 @@ "github_icon": "" }, "style": "plain", - "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }}<#FFAFD7>*{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#FFAFD7>*{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" } ], diff --git a/themes/rudolfs-dark.omp.json b/themes/rudolfs-dark.omp.json index 3951d615..74b48242 100644 --- a/themes/rudolfs-dark.omp.json +++ b/themes/rudolfs-dark.omp.json @@ -48,7 +48,7 @@ "fetch_upstream_icon": true }, "style": "plain", - "template": "[ {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ]", + "template": "[ {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ]", "type": "git" }, { diff --git a/themes/rudolfs-light.omp.json b/themes/rudolfs-light.omp.json index 388328f5..bf351891 100644 --- a/themes/rudolfs-light.omp.json +++ b/themes/rudolfs-light.omp.json @@ -38,7 +38,7 @@ "fetch_upstream_icon": true }, "style": "plain", - "template": " [{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }}<#BD6200> \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#053F22> \uf046 {{ .Staging.String }}{{ end }}] ", + "template": " [{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#BD6200> \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#053F22> \uf046 {{ .Staging.String }}{{ end }}] ", "type": "git" }, { diff --git a/themes/slim.omp.json b/themes/slim.omp.json index 78ec9855..cf7005b0 100644 --- a/themes/slim.omp.json +++ b/themes/slim.omp.json @@ -70,7 +70,7 @@ "fetch_upstream_icon": true }, "style": "diamond", - "template": "<#7a7a7a>\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": "<#7a7a7a>\ue0b1 {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ 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 }} ", "type": "git" }, { diff --git a/themes/slimfat.omp.json b/themes/slimfat.omp.json index 835157bc..3b9f1218 100644 --- a/themes/slimfat.omp.json +++ b/themes/slimfat.omp.json @@ -68,7 +68,7 @@ "fetch_upstream_icon": true }, "style": "diamond", - "template": "<#7a7a7a>\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": "<#7a7a7a>\ue0b1 {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ 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 }} ", "type": "git" }, { diff --git a/themes/smoothie.omp.json b/themes/smoothie.omp.json index 7e939b7d..68584104 100644 --- a/themes/smoothie.omp.json +++ b/themes/smoothie.omp.json @@ -30,7 +30,7 @@ "fetch_status": true }, "style": "plain", - "template": "\u27e8{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \u2206{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}\u27e9", + "template": "\u27e8{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \u2206{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}\u27e9", "type": "git" }, { diff --git a/themes/star.omp.json b/themes/star.omp.json index a7ca1aa5..bc7f0ca6 100644 --- a/themes/star.omp.json +++ b/themes/star.omp.json @@ -25,7 +25,7 @@ "fetch_status": true }, "style": "plain", - "template": "<#ffffff>on {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", + "template": "<#ffffff>on {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", "type": "git" }, { diff --git a/themes/stelbent-compact.minimal.omp.json b/themes/stelbent-compact.minimal.omp.json index c4e6f9ec..3926e60b 100644 --- a/themes/stelbent-compact.minimal.omp.json +++ b/themes/stelbent-compact.minimal.omp.json @@ -39,7 +39,7 @@ "{{ if gt .Ahead 0 }}#89d1dc{{ end }}", "{{ if gt .Behind 0 }}#c5b6ad{{ end }}" ], - "template": " {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} \u2502{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }} ", + "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} \u2502{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }} ", "properties": { "branch_ahead_icon": "\u2191", "branch_behind_icon": "\u2193", diff --git a/themes/stelbent.minimal.omp.json b/themes/stelbent.minimal.omp.json index ca37761a..cf16f443 100644 --- a/themes/stelbent.minimal.omp.json +++ b/themes/stelbent.minimal.omp.json @@ -75,7 +75,7 @@ "tag_icon": "\u25b6 " }, "style": "powerline", - "template": " {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} \u2502{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }} ", + "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} \u2502{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/the-unnamed.omp.json b/themes/the-unnamed.omp.json index 4f37ab35..3fa1342e 100644 --- a/themes/the-unnamed.omp.json +++ b/themes/the-unnamed.omp.json @@ -19,7 +19,7 @@ "branch_icon": "\ue0a0 " }, "style": "plain", - "template": "<#F3EFF5>on {{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", + "template": "<#F3EFF5>on {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }} ", "type": "git" }, { diff --git a/themes/thecyberden.omp.json b/themes/thecyberden.omp.json index db62f57c..85be9f72 100644 --- a/themes/thecyberden.omp.json +++ b/themes/thecyberden.omp.json @@ -40,7 +40,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/tokyo.omp.json b/themes/tokyo.omp.json index fd50c2bb..aac36a01 100644 --- a/themes/tokyo.omp.json +++ b/themes/tokyo.omp.json @@ -51,7 +51,7 @@ "fetch_upstream_icon": true }, "style": "plain", - "template": "[<#ffffff>{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ 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>\uf692 {{ .StashCount }}{{ end }}]", + "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>\uf692 {{ .StashCount }}{{ end }}]", "type": "git" }, { diff --git a/themes/unicorn.omp.json b/themes/unicorn.omp.json index 2e27e141..8a0e3b31 100644 --- a/themes/unicorn.omp.json +++ b/themes/unicorn.omp.json @@ -43,7 +43,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/velvet.omp.json b/themes/velvet.omp.json index 8188071b..137b8330 100644 --- a/themes/velvet.omp.json +++ b/themes/velvet.omp.json @@ -48,7 +48,7 @@ "fetch_upstream_icon": true }, "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "type": "git" }, { diff --git a/themes/wholespace.json b/themes/wholespace.json index 69bd4e1f..213b185d 100644 --- a/themes/wholespace.json +++ b/themes/wholespace.json @@ -91,7 +91,7 @@ "fetch_worktree_count": true }, "style": "diamond", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", "trailing_diamond": "\ue0b0", "type": "git" } diff --git a/website/docs/configuration/example.mdx b/website/docs/configuration/example.mdx index 7b2180d7..9832fcb5 100644 --- a/website/docs/configuration/example.mdx +++ b/website/docs/configuration/example.mdx @@ -76,7 +76,7 @@ import TabItem from "@theme/TabItem" "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ffffff{{ end }}" ], "powerline_symbol": "\ue0b0", - "template": " {{ .HEAD }}{{ .BranchStatus }} ", + "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }} ", "properties": { "branch_max_length": 25, "fetch_status": true @@ -151,7 +151,7 @@ blocks: foreground_templates: - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ffffff{{ end }}" powerline_symbol: "\ue0b0" - template: " {{ .HEAD }}{{ .BranchStatus }} " + template: " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }} " properties: branch_max_length: 25 fetch_status: true @@ -229,7 +229,7 @@ type = "prompt" foreground = "#193549" foreground_templates = [ "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ffffff{{ end }}" ] powerline_symbol = "\ue0b0" - template = " {{ .HEAD }}{{ .BranchStatus }} " + template = " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }} " style = "powerline" type = "git" diff --git a/website/docs/segments/git.mdx b/website/docs/segments/git.mdx index f8746293..c0565151 100644 --- a/website/docs/segments/git.mdx +++ b/website/docs/segments/git.mdx @@ -43,7 +43,7 @@ An alternative is to use the [Posh-Git segment][poshgit]. "{{ if gt .Ahead 0 }}#B388FF{{ end }}", "{{ if gt .Behind 0 }}#B388FB{{ end }}" ], - "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ .BranchStatus }}{{ if .Working.Changed }} \uF044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uF046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uF692 {{ .StashCount }}{{ end }}", + "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uF044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uF046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uF692 {{ .StashCount }}{{ end }}", "properties": { "fetch_status": true, "fetch_stash_count": true, @@ -108,7 +108,7 @@ instead of the repo path. :::note default template ``` template -{{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }} \uF044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uF046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} \uF692 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }} +{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uF044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uF046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} \uF692 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }} ``` :::