From: Edward Delaporte <delaport@illinois.edu>
Date: Thu, 3 Feb 2022 20:25:58 +0000 (-0600)
Subject: Merge branch 'main' of github.com:edthedev/dotfiles into main
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/78d3ab50af2c6dd8d20e8e0a80a5c9f5d0e1e77f?hp=e5228b3e9eed46e26324fdb2ac0e8b1cfe7f3419

Merge branch 'main' of github.com:edthedev/dotfiles into main
---

diff --git a/oh-my-posh.omp.json b/oh-my-posh.omp.json
new file mode 100644
index 0000000..cd63323
--- /dev/null
+++ b/oh-my-posh.omp.json
@@ -0,0 +1,78 @@
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "blocks": [
+    {
+      "type": "prompt",
+      "alignment": "left",
+      "segments": [
+        {
+          "type": "session",
+          "style": "plain",
+          "foreground": "#ffffff",
+          "properties": {
+            "prefix": "<#CB4B16>┏[</>",
+            "postfix": "<#CB4B16>]</>",
+            "template": "{{ .UserName }}"
+          }
+        },
+        {
+          "type": "python",
+          "style": "plain",
+          "foreground": "#ffffff",
+          "properties": {
+            "prefix": "<#CB4B16>[</>",
+            "postfix": "<#CB4B16>]</>",
+            "template": " Py {{ .Full }} "
+          }
+        },
+        {
+          "type": "git",
+          "style": "plain",
+          "foreground": "#ffffff",
+          "properties": {
+            "prefix": "<#CB4B16>[</>",
+            "postfix": "<#CB4B16>]</>",
+            "template": "{{ .HEAD }}"
+          }
+        },
+        {
+          "type": "root",
+          "style": "plain",
+          "foreground": "#ffffff",
+          "properties": {
+            "prefix": "<#CB4B16>[</>",
+            "postfix": "<#CB4B16>]</>"
+          }
+        },
+        {
+          "type": "exit",
+          "style": "plain",
+          "foreground": "#ffffff",
+          "properties": {
+            "template": "{{ .Text }}",
+            "prefix": "<#CB4B16>[x</>",
+            "postfix": "<#CB4B16>]</>"
+          }
+        }
+      ]
+    },
+    {
+      "type": "prompt",
+      "alignment": "left",
+      "newline": true,
+      "segments": [
+        {
+          "type": "path",
+          "style": "plain",
+          "foreground": "#ffffff",
+          "properties": {
+            "style": "full",
+            "prefix": "<#CB4B16>┖[</>",
+            "postfix": "<#CB4B16>]></>"
+          }
+        }
+      ]
+    }
+  ],
+  "final_space": true
+}
diff --git a/screenrc b/screenrc
index 1cf8ea6..b5b748e 100644
--- a/screenrc
+++ b/screenrc
@@ -20,6 +20,10 @@ hardstatus string '%{= kG}[ %{G}%H %{g}][%= %{= kw}%?%-Lw%?%{r}(%{W}* %t%?(%u)%?
 # Pick ye olde shell.
 # shell /bin/zsh
 
-if [ -d /opt/powershell ]; then
-	shell /opt/powershell/pwsh
-fi
+# if [ -d /opt/powershell ]; then
+#	shell /opt/powershell/pwsh
+#else
+#	shell /bin/bash
+#fi
+
+shell -$SHELL
diff --git a/setup/ReadMe.md b/setup/ReadMe.md
index ae371d0..4caafe2 100644
--- a/setup/ReadMe.md
+++ b/setup/ReadMe.md
@@ -4,3 +4,7 @@ These scripts are to set up or configure a favorite software tool.
 See `/install` for scripts to install a favorite software tool.
 
 You typically want to run these scripts without elevation - **as your preferred login user**.
+
+## Windows Tips
+
+You want a font installed and configured for Windows Terminal ending in PL to make nice powerline features work.
diff --git a/vimrc b/vimrc
index 601a676..09fa0d2 100644
--- a/vimrc
+++ b/vimrc
@@ -55,7 +55,7 @@ Plug 'pprovost/vim-ps1'
 " Plug NLKNguyen/papercolor-theme
 "
 "
-Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+" Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 
 call plug#end()