From d747cb7e458217e482453d3bbf48a3559dc57d3f Mon Sep 17 00:00:00 2001
From: Graham Hall <graham@ghall.dev>
Date: Fri, 7 Jun 2024 21:24:45 -0400
Subject: [PATCH] ohmyposh config

---
 micro_config/settings.json |   6 ++
 misc_config/ohmyposh.json  | 123 +++++++++++++++++++++++++++++++++++++
 zed_config/settings.json   |   4 +-
 zsh_config/zshrc           |   6 +-
 4 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 misc_config/ohmyposh.json

diff --git a/micro_config/settings.json b/micro_config/settings.json
index bf72d97..5965fbd 100644
--- a/micro_config/settings.json
+++ b/micro_config/settings.json
@@ -1,5 +1,11 @@
 {
     "colorscheme": "atom-dark",
+    "lsp.autocompleteDetails": false,
+    "lsp.formatOnSave": true,
+    "lsp.ignoreMessages": "LS message1 to ignore|LS message 2 to ignore|...",
+    "lsp.ignoreTriggerCharacters": "completion,signature",
+    "lsp.server": "go=gopls,typescript=typescript-language-server",
+    "lsp.tabcompletion": true,
     "softwrap": true,
     "tabsize": 2
 }
diff --git a/misc_config/ohmyposh.json b/misc_config/ohmyposh.json
new file mode 100644
index 0000000..6c28ed5
--- /dev/null
+++ b/misc_config/ohmyposh.json
@@ -0,0 +1,123 @@
+{
+    "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+    "blocks": [
+      {
+        "alignment": "left",
+        "newline": true,
+        "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 }} \ueb4b {{ .StashCount }}{{ end }} ",
+            "type": "git"
+          }
+        ],
+        "type": "prompt"
+      },
+      {
+        "alignment": "right",
+        "segments": [
+          {
+            "type": "status",
+            "style": "plain",
+            "foreground": "#b8ff75",
+            "foreground_templates": [
+              "{{ if gt .Code 0 }}#E06C75{{ end }}"
+            ],
+            "template": " x{{ reason .Code }}"
+          },
+          {
+            "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"
+      }
+    ],
+    "transient_prompt": {
+        "background": "transparent",
+        "foreground": "#ffffff",
+        "template": "{{ .Shell }}> "
+    },
+    "final_space": true,
+    "version": 2
+  }
diff --git a/zed_config/settings.json b/zed_config/settings.json
index b29723a..a86f0a6 100644
--- a/zed_config/settings.json
+++ b/zed_config/settings.json
@@ -28,7 +28,7 @@
   "theme": {
     "mode": "system",
     "light": "Ayu Light",
-    "dark": "Catppuccin Mocha"
+    "dark": "Modest Dark"
   },
   "ui_font_family": "SF Pro Display",
   "ui_font_features": {},
@@ -57,6 +57,6 @@
     "indent_size": 10
   },
   "file_types": {
-    "HTML": ["hbs", "njk"]
+    "HTML": ["hbs", "njk", "webc"]
   }
 }
diff --git a/zsh_config/zshrc b/zsh_config/zshrc
index b2c9d2b..2fb607b 100644
--- a/zsh_config/zshrc
+++ b/zsh_config/zshrc
@@ -8,9 +8,13 @@ unset conf
 
 [[ "$TERM_PROGRAM" == "CodeEditApp_Terminal" ]] && . "/Applications/CodeEdit.app/Contents/Resources/codeedit_shell_integration.zsh"
 
+if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then
+	eval "$(oh-my-posh init zsh --config ~/dotfiles/misc_config/ohmyposh.json)"
+fi
+
 eval $(thefuck --alias)
 eval "$(zoxide init zsh)"
-eval "$(starship init zsh)"
+# eval "$(starship init zsh)"
 eval "$(atuin init zsh)"
 
 # bun completions