Preping and testing system improvements

* oh-my-posh prompt to include gcloud env based info (ties in very well
  with direnv)
* sz-add-my-apt-repos - code updates, better comments. added ms repo for
  edge and powershell
* sz-doctor improvements/cleanup
This commit is contained in:
Gal Szkolnik 2022-06-15 10:00:10 -04:00
parent d0447b4f61
commit 42d570d673
3 changed files with 101 additions and 36 deletions

View file

@ -2,7 +2,47 @@
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
"blocks": [
{
"type": "prompt",
"alignment": "left",
"segments": [
{
"background": "#4e9a06",
"background_templates": [
"{{ if or (.Working.Changed) (.Staging.Changed) }}#c4a000{{ end }}",
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}#f26d50{{ end }}",
"{{ if gt .Ahead 0 }}#89d1dc{{ end }}",
"{{ if gt .Behind 0 }}#4e9a06{{ end }}"
],
"foreground": "#000000",
"style": "diamond",
"leading_diamond": " \ue0b2",
"properties": {
"branch_icon": "\uf126 ",
"fetch_stash_count": true,
"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 }}",
"type": "git"
},
{
"background": "#d3d7cf",
"foreground": "#000000",
"powerline_symbol": "\ue0b0",
"style": "powerline",
"type": "text",
"template": "{{ if .Env.CLOUDSDK_ACTIVE_CONFIG_NAME }} \ue7b2 {{ .Env.CLOUDSDK_ACTIVE_CONFIG_NAME }} {{ end }}"
},
{
"style": "plain",
"type": "text",
"template": " "
}
]
},
{
"alignment": "left",
"newline": true,
"segments": [
{
"background": "#d3d7cf",
@ -32,32 +72,21 @@
"foreground": "#e4e4e4",
"powerline_symbol": "\ue0b0",
"properties": {
"home_icon": "~",
"style": "full"
"home_icon": "\ufd24",
"mixed_threshold": 3,
"style": "unique",
"mapped_locations": {
"/": "\ue299/",
"~/_pqb": "\ufab4",
"~/_pqb/code": "\ufab4\ue796",
"~/_pqb/code/slurm/moe-access": "\ue3bf\uf2c2",
"~/_pqb/code/slurm": "\uf1b0",
"~/_pqb/code/slurm/pqb-terraform": "\uf1b0\ufa08"
}
},
"style": "powerline",
"template": " \uf07c {{ .Path }}",
"type": "path"
},
{
"background": "#4e9a06",
"background_templates": [
"{{ if or (.Working.Changed) (.Staging.Changed) }}#c4a000{{ end }}",
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}#f26d50{{ end }}",
"{{ if gt .Ahead 0 }}#89d1dc{{ end }}",
"{{ if gt .Behind 0 }}#4e9a06{{ end }}"
],
"foreground": "#000000",
"powerline_symbol": "\ue0b0",
"properties": {
"branch_icon": "\uf126 ",
"fetch_stash_count": true,
"fetch_status": true,
"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 }}",
"type": "git"
}
],
"type": "prompt"