Tweak for Win vs Pi

[dotfiles.git] / Microsoft.PowerShell_profile.ps1

diff --git a/Microsoft.PowerShell_profile.ps1 b/Microsoft.PowerShell_profile.ps1
index 5b5d4553b2500046f29b2d94ef8cceeb07b2edf4..7f228624c3a2529febeeda966821165986b1e19f 100644 (file)
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@ -1,45 +1,72 @@
 # .EXAMPLE
 # . C:\src\dotfiles\Microsoft.PowerShell_profile.ps1
 
-Import-Module posh-git
 # Courtesty of MKletz
 # Get-ChildItem -Path 'C:\Repos' -Filter "*.psd1" -Recurse | ForEach-Object -Process {
 #     $Path = Split-Path -Path $_.Directory -Parent
 #     $env:PSModulePath = $env:PSModulePath + ";$($Path)"
 #}
-$env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
+# $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
 
-if($IsWindows -eq "") {
-       # Bootstrap for older PowerShell
-       $IsWindows = ($env:OS -eq "Windows_NT")
-}
+# No longer needed in PowerShell 7
+# if($IsWindows -eq "") {
+#      # Bootstrap for older PowerShell
+#      $IsWindows = ($env:OS -eq "Windows_NT")
+# }
+
+#if($IsWindows){
+#      # Some Paths that are annoying to find/restore if the installer fails
+#      $ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
+#      $ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
+#      $ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
+#      $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
+#}
+
+$env:Journal = "~\Journal\2021" # allows cd $env:journal
+
+$src = "~"
 if($IsWindows){
-       # Some Paths that are annoying to find/restore if the installer fails
-       $ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
-       $ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
-       $ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
-       $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
+  $src = "c:\src"
 }
 
 # Import some home grown PowerShell modules, if they are installed.
-$modPaths = @("C:\src\dotfiles\ToyBox\toybox.psm1")
+#
+$modPaths = Get-Childitem -Path "$src\dotfiles\psmodules"
+$modPaths += Get-Childitem -Path "$src\minion\psmodule"
+if($modPaths.length -eq 0){
+       Write-Host "No modules found."
+}
 $modPaths | ForEach-Object {
-  $_ | Format-Table
-  if(Test-Path -Path $_) {
-    Import-Module $_
-    Write-Host "Loaded $_"
-  }
+       $fileName = $_.FullName
+       Import-Module $fileName
+       Write-Host ">> Loaded $fileName"
 }
 
+# $env:PSModulePath = $env:PSModulePath + ";$src\dotfiles\psmodules"
+
+
 # Linux-like up/down in shell
 Set-PSReadlineKeyHandler -Key UpArrow -Function HistorySearchBackward 
 Set-PSReadlineKeyHandler -Key DownArrow -Function HistorySearchForward 
 Set-PSReadlineOption -HistorySavePath c:\temp\PSHistory.log
 
-# Minion commands - 'today'
-. C:\src\minion\profiles\alias.ps1
+# Minion alias commands - 'today'
+. $src\minion\profiles\alias.ps1
+# Add Minion to path
+Write-Host "+ Added minion command to path."
+$ENV:PATH+=";$src\minion\go" # Flag to ensure my profile kicked in.
 
 # Unix dies hard.
 New-Alias which get-command
 
-# cd c:\src
+# Delay loading PoshGit for speed. 
+function Enable-PoshGit {
+       Import-Module posh-git
+}
+New-Alias pg    Enable-PoshGit
+Write-Host "+ Type 'pg' to enable PoshGit"
+
+
+if((Get-Location).Path -eq $HOME){
+       cd $src
+}