fix omp

jpawlowski · Aug 15, 2024 · b36fbff · b36fbff
1 parent e4e8f84
commit b36fbff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/powershell-extended/devcontainer-feature.json b/src/powershell-extended/devcontainer-feature.json
@@ -100,10 +100,16 @@
   },
   "containerEnv": {
     "POWERSHELL_DISTRIBUTION_CHANNEL": "DevContainer-Feature:PowerShell-Extended",
-    "PSPROFILE_AUTOUPDATE_MODULEHELP": "true",
+
     "PSPROFILE_PSREADLINE_EDITMODE": "Emacs",
+    "PSPROFILE_POSH_DISABLE_UPGRADE_NOTICE": "true",
+    "PSPROFILE_ALIAS_DIR_FORCE": "false",
+    "PSPROFILE_ALIAS_DIR_HIDDEN": "true",
+    "PSPROFILE_ALIAS_DIR_SORT": "true",
+
+    "PSPROFILE_AUTOUPDATE_MODULEHELP": "true",
     "PSPROFILE_PSREADLINE_PREDICTION_SOURCE": "HistoryAndPlugin",
-    "PSPROFILE_PSREADLINE_PREDICTION_VIEWSTYLE": "ListView",
+    "PSPROFILE_PSREADLINE_PREDICTION_VIEWSTYLE": "InlineView",
     "PSPROFILE_POSH_THEME": "devcontainers.minimal",
     "PSPROFILE_TERMINAL_COMPLETION_GIT": "true",
     "PSPROFILE_TERMINAL_COMPLETION_POSH": "false",
@@ -113,22 +119,19 @@
     "PSPROFILE_TERMINAL_ICONS": "true",
     "PSPROFILE_TERMINAL_PSSCRIPTTOOLS": "true",
     "PSPROFILE_TERMINAL_Z": "true",
+
     "PSPROFILE_VSCODE_AUTOUPDATE_MODULEHELP": "false",
-    "PSPROFILE_VSCODE_POSH_THEME": "devcontainers.minimal",
     "PSPROFILE_VSCODE_PSREADLINE_PREDICTION_SOURCE": "HistoryAndPlugin",
-    "PSPROFILE_VSCODE_PSREADLINE_PREDICTION_VIEWSTYLE": "ListView",
+    "PSPROFILE_VSCODE_PSREADLINE_PREDICTION_VIEWSTYLE": "InlineView",
+    "PSPROFILE_VSCODE_POSH_THEME": "devcontainers.minimal",
     "PSPROFILE_VSCODE_TERMINAL_COMPLETION_GIT": "true",
     "PSPROFILE_VSCODE_TERMINAL_COMPLETION_POSH": "false",
     "PSPROFILE_VSCODE_TERMINAL_COMPLETION_PREDICTOR": "true",
     "PSPROFILE_VSCODE_TERMINAL_COMPLETION_PREDICTOR_AZ": "false",
     "PSPROFILE_VSCODE_TERMINAL_COMPLETION_PSFZF": "false",
     "PSPROFILE_VSCODE_TERMINAL_ICONS": "true",
     "PSPROFILE_VSCODE_TERMINAL_PSSCRIPTTOOLS": "true",
-    "PSPROFILE_VSCODE_TERMINAL_Z": "true",
-    "PSPROFILE_POSH_DISABLE_UPGRADE_NOTICE": "true",
-    "PSPROFILE_ALIAS_DIR_FORCE": "false",
-    "PSPROFILE_ALIAS_DIR_HIDDEN": "true",
-    "PSPROFILE_ALIAS_DIR_SORT": "true"
+    "PSPROFILE_VSCODE_TERMINAL_Z": "true"
   },
   "customizations": {
     "vscode": {

diff --git a/src/powershell-extended/dotfiles/.config/powershell/Microsoft.PowerShell_profile.ps1 b/src/powershell-extended/dotfiles/.config/powershell/Microsoft.PowerShell_profile.ps1
@@ -52,7 +52,8 @@ try {
     #endregion Environment -----------------------------------------------------
 
     #region Oh My Posh =========================================================
-    if ($null -ne [Environment]::GetEnvironmentVariable('PSPROFILE_VSCODE_POSH_THEME')) { __PSProfile-Enable-OhMyPosh-Theme -ThemeName $env:PSPROFILE_VSCODE_POSH_THEME } else { __PSProfile-Enable-OhMyPosh-Theme }
+    $__PSProfileEnvOhMyPoshTheme = [Environment]::GetEnvironmentVariable('PSPROFILE_POSH_THEME')
+    if ($null -ne $__PSProfileEnvOhMyPoshTheme) { __PSProfile-Enable-OhMyPosh-Theme -ThemeName $__PSProfileEnvOhMyPoshTheme } else { __PSProfile-Enable-OhMyPosh-Theme }
     if ([Environment]::GetEnvironmentVariable('PSPROFILE_VSCODE_TERMINAL_COMPLETION_POSH') -eq $true) { oh-my-posh completion powershell | Out-String | Invoke-Expression }
     if ([Environment]::GetEnvironmentVariable('PSPROFILE_POSH_DISABLE_UPGRADE_NOTICE') -eq $true) { $null = Start-ThreadJob -Name 'PoshDisableNotice' -ScriptBlock { oh-my-posh disable notice } }
     #endregion Oh My Posh ------------------------------------------------------

diff --git a/src/powershell-extended/dotfiles/.config/powershell/Microsoft.VSCode_profile.ps1 b/src/powershell-extended/dotfiles/.config/powershell/Microsoft.VSCode_profile.ps1
@@ -62,7 +62,8 @@ try {
     #endregion Environment -----------------------------------------------------
 
     #region Oh My Posh =========================================================
-    if ($null -ne [Environment]::GetEnvironmentVariable('PSPROFILE_VSCODE_POSH_THEME')) { __PSProfile-Enable-OhMyPosh-Theme -ThemeName $env:PSPROFILE_VSCODE_POSH_THEME } else { __PSProfile-Enable-OhMyPosh-Theme }
+    $__PSProfileEnvOhMyPoshTheme = [Environment]::GetEnvironmentVariable('PSPROFILE_VSCODE_POSH_THEME')
+    if ($null -ne $__PSProfileEnvOhMyPoshTheme) { __PSProfile-Enable-OhMyPosh-Theme -ThemeName $__PSProfileEnvOhMyPoshTheme } else { __PSProfile-Enable-OhMyPosh-Theme }
     if ([Environment]::GetEnvironmentVariable('PSPROFILE_VSCODE_TERMINAL_COMPLETION_POSH') -eq $true) { oh-my-posh completion powershell | Out-String | Invoke-Expression }
     if ([Environment]::GetEnvironmentVariable('PSPROFILE_POSH_DISABLE_UPGRADE_NOTICE') -eq $true) { $null = Start-ThreadJob -Name 'PoshDisableNotice' -ScriptBlock { oh-my-posh disable notice } }
     #endregion Oh My Posh ------------------------------------------------------