Skip to content

Commit

Permalink
Merge pull request #172 from szymonos/dev
Browse files Browse the repository at this point in the history
fix(ps): profiles
  • Loading branch information
szymonos authored Oct 2, 2024
2 parents a206653 + db58205 commit 5243906
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .assets/config/pwsh_cfg/profile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Remove-Variable path

#region prompt
if (-not $isWSL1 -and (Test-Path '/usr/bin/oh-my-posh')) {
oh-my-posh --init --shell pwsh --config "$(Resolve-Path $env:OMP_PATH/theme.omp.json -ErrorAction Stop)" | Invoke-Expression
oh-my-posh --init --shell pwsh --config "$(Resolve-Path $env:OMP_PATH/theme.omp.json -ErrorAction Stop)" | Invoke-Expression | Out-Null
# disable venv prompt as it is handled in oh-my-posh theme
[Environment]::SetEnvironmentVariable('VIRTUAL_ENV_DISABLE_PROMPT', $true)
} else {
Expand Down
2 changes: 1 addition & 1 deletion .assets/provision/setup_profile_user.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if (Test-Path $HOME/miniconda3/bin/conda -PathType Leaf) {
Write-Verbose 'adding miniconda initialization...'
$content = [string]::Join("`n",
'#region conda initialize',
'try { (& "$HOME/miniconda3/bin/conda" "shell.powershell" "hook") | Out-String | Invoke-Expression } catch { Out-Null }',
'try { (& "$HOME/miniconda3/bin/conda" "shell.powershell" "hook") | Out-String | Invoke-Expression | Out-Null } catch { Out-Null }',
'#endregion'
)
[System.IO.File]::AppendAllText($PROFILE.CurrentUserAllHosts, $content)
Expand Down

0 comments on commit 5243906

Please sign in to comment.