aanpassing git

.gitignore

@@ -1,3 +1,4 @@
+./*
 !./kde-plasma-theme.omp.json
 !./README.com
 !./.gitignore

kde-plasma-theme.omp.json

@@ -1,16 +1,9 @@
 {
-  // "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "profiles":{
-    "defaults":{
-      "font":{
-        "face": "Nerd Font"
-        }
-      }
-  },
   "palette": {
     "bg-1": "#232627",
     "bg-2": "#3c4045",
-    "git": "#f67400",
+    "git": "#403963",
     "light-grey": "#cccccc",
     "os": "#6a0dad",
     "path": "#eff0f1",
@@ -19,7 +12,7 @@
     "time": "#eff0f1"
   },
   "transient_prompt": {
-    "template": "❯ ",
+    "template": "> ",
     "foreground": "#888888",
     "background": "transparent"
   },
@@ -69,35 +62,50 @@
       "alignment": "right",
       "segments": [
         {
+          "properties": {
+            "fetch_status": true,
+            "fetch_upstream_icon": true,
+            "mapped_branches": {
+              "bug/*": "🐛 ",
+              "feat/*": "\ud83d\ude80 "
+            },
+            "source": "cli",
+            "untracked_modes": {
+              "/Users/user/Projects/oh-my-posh/": "no"
+            }
+          },
+          "leading_diamond": "\ue0b2",
+          "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 }} \uf0c7 {{ .StashCount }}{{ end }}",
+          "foreground": "p:light-grey",
+          "background": "p:light-grey",
           "type": "git",
           "style": "diamond",
-          "leading_diamond": "\ue0b2",
+          "background_templates": [
-          "foreground": "p:bg-1",
+            "{{ if or (.Working.Changed) (.Staging.Changed) }}p:git{{ end }}",
-          "background": "p:light-grey",
+            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:git{{ end }}",
-          "properties": {
+            "{{ if gt .Ahead 0 }}p:git{{ end }}",
-            "fetch_status": true
+            "{{ if gt .Behind 0 }}p:git{{ end }}"
-          },
+          ]
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if .Staging.IsDirty }} \uf044 {{ .Staging.String }}{{ end }}{{ if .Working.IsDirty }} \uf044 {{ .Working.String }}{{ end }} "
         },
         {
+          "leading_diamond": "\ue0b2",
+          "template": "\ue235 {{ .Venv }} ",
+          "foreground": "p:bg-1",
+          "background": "p:light-grey",
           "type": "python",
-          "style": "diamond",
+          "style": "diamond"
-          "leading_diamond": "\ue0b2",
-          "foreground": "p:bg-1",
-          "background": "p:light-grey",
-          "template": "\ue235 {{ .Venv }} "
         },
         {
-          "type": "time",
-          "style": "diamond",
-          "leading_diamond": "\ue0b2",
-          "trailing_diamond": "\ue0b4",
-          "foreground": "p:bg-1",
-          "background": "p:os",
           "properties": {
             "time_format": "15:04:05"
           },
-          "template": " {{ .CurrentDate | date \"15:04:05\" }} "
+          "leading_diamond": "\ue0b2",
+          "trailing_diamond": "\ue0b4",
+          "template": " {{ .CurrentDate | date \"15:04:05\" }} ",
+          "foreground": "p:light-grey",
+          "background": "p:os",
+          "type": "time",
+          "style": "diamond"
         }
       ]
     }

kde-plasma-theme.omp.json.bak

@@ -0,0 +1,122 @@
+{
+  "$schema": "https://git.noorlander.info/E.Noorlander/posh_noorlander/src/branch/main/kde-plasma-theme.omp.json",
+  "profiles":{
+    "defaults":{
+      "font":{
+        "face": "Nerd Font"
+        }
+      }
+  },
+  "palette": {
+    "bg-1": "#232627",
+    "bg-2": "#3c4045",
+    "git": "#403963",
+    "light-grey": "#cccccc",
+    "os": "#6a0dad",
+    "path": "#eff0f1",
+    "python": "#3daee9",
+    "shell": "#d0a0e0",
+    "time": "#eff0f1"
+  },
+  "transient_prompt": {
+    "template": "❯ ",
+    "foreground": "#888888",
+    "background": "transparent"
+  },
+  "blocks": [
+    {
+      "type": "prompt",
+      "alignment": "left",
+      "segments": [
+        {
+          "properties": {
+            "cache_duration": "none"
+          },
+          "leading_diamond": "\ue0b6",
+          "template": " {{ .Icon }} ",
+          "foreground": "p:bg-1",
+          "background": "p:os",
+          "type": "os",
+          "style": "diamond"
+        },
+        {
+          "properties": {
+            "cache_duration": "none"
+          },
+          "template": " {{ if eq .Name \"bash\" }}\uebca{{ else }}\ue795{{ end }} ",
+          "foreground": "p:bg-1",
+          "powerline_symbol": "\ue0b0",
+          "background": "p:shell",
+          "type": "shell",
+          "style": "powerline"
+        },
+        {
+          "properties": {
+            "cache_duration": "none",
+            "style": "full"
+          },
+          "template": " \ue5ff {{ .Path }} ",
+          "foreground": "p:os",
+          "powerline_symbol": "\ue0b0",
+          "background": "p:light-grey",
+          "type": "path",
+          "style": "powerline"
+        }
+      ]
+    },
+    {
+      "type": "rprompt",
+      "alignment": "right",
+      "segments": [
+        {
+          "type": "git",
+          "style": "diamond",
+          "leading_diamond": "\ue0b2",
+          "foreground": "p:bg-1",
+          "background": "p:light-grey",
+          "background_templates": [
+            "{{ if or (.Working.Changed) (.Staging.Changed) }}p:git{{ end }}",
+            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:git{{ end }}",
+            "{{ if gt .Ahead 0 }}p:git{{ end }}",
+            "{{ if gt .Behind 0 }}p:git{{ 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 }}",
+          "properties": {
+            "fetch_status": true,
+            "fetch_upstream_icon": true,
+            "untracked_modes": {
+              "/Users/user/Projects/oh-my-posh/": "no"
+            },
+            "source": "cli",
+            "mapped_branches": {
+              "feat/*": "🚀 ",
+              "bug/*": "🐛 "
+            }
+          }
+        },
+        {
+          "type": "python",
+          "style": "diamond",
+          "leading_diamond": "\ue0b2",
+          "foreground": "p:bg-1",
+          "background": "p:light-grey",
+          "template": "\ue235 {{ .Venv }} "
+        },
+        {
+          "type": "time",
+          "style": "diamond",
+          "leading_diamond": "\ue0b2",
+          "trailing_diamond": "\ue0b4",
+          "foreground": "p:bg-1",
+          "background": "p:os",
+          "properties": {
+            "time_format": "15:04:05"
+          },
+          "template": " {{ .CurrentDate | date \"15:04:05\" }} "
+        }
+      ]
+    }
+  ],
+  "version": 1,
+  "final_space": true
+}