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 (file)
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 1cf8ea655c9709373c0794763de142717342be52..b5b748ee5520b7fc291e06d526ad94379efa5b3e 100644 (file)
--- 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 ae371d08c300e23cf70c8a2fab03572ebd130f28..4caafe20ee936de9ac99844980240c7ecfe57f29 100644 (file)
--- 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.\r
 \r
 You typically want to run these scripts without elevation - **as your preferred login user**.\r
+\r
+## Windows Tips\r
+\r
+You want a font installed and configured for Windows Terminal ending in PL to make nice powerline features work.\r

diff --git a/vimrc b/vimrc
index 601a6766e6b102314375b193d70abf5353cfee8e..09fa0d28bb2111b4a99c0c67cf56b463ca1026a7 100644 (file)
--- 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()