feat(powershell, pwsh): Introducing unified pwsh and powershell profile

I moved all of the previous configuration into the windows powershell profile, because of backwards compatibility. The cross-platform powershell now loads first the windows powershell profile, and after that it loads its specific profile.
kalocsaibotond · Apr 22, 2024 · 0dea6ce · 0dea6ce
1 parent 3d78a95
commit 0dea6ce
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/home/.chezmoiscripts/run_after_Copy-TargetStates.ps1.tmpl b/home/.chezmoiscripts/run_after_Copy-TargetStates.ps1.tmpl
@@ -1,5 +1,5 @@
 {{- if eq .chezmoi.os "windows" }}
-."{{- .chezmoi.sourceDir -}}\Documents\PowerShell\Functions.ps1"
+."{{- .chezmoi.sourceDir -}}\Documents\WindowsPowerShell\Functions.ps1"
 
 if (Test-Command -Name "scoop"){
     $ScoopList = $(scoop list)

diff --git a/home/Documents/PowerShell/Microsoft.PowerShell_profile.ps1 b/home/Documents/PowerShell/Microsoft.PowerShell_profile.ps1
@@ -1,6 +1,12 @@
-$ProfileLocation = Split-Path -Path $Profile.CurrentUserCurrentHost -Parent
+# Loading Windows PowerShell profile
+$WindowsPowershellProfile = (
+    powershell -NoProfile -Command {
+        Write-OutPut -InputObject $($Profile.CurrentUserCurrentHost)
+    }
+)
+.$WindowsPowershellProfile
 
-."$ProfileLocation\Variables.ps1"
-."$ProfileLocation\Initialisations.ps1"
-."$ProfileLocation\Functions.ps1"
-."$ProfileLocation\Aliases.ps1"
+# Loading Cross Platform powershell specific profile
+$PwshProfileLocation = (
+    Split-Path -Path $Profile.CurrentUserCurrentHost -Parent
+)
diff --git a/home/Documents/PowerShell/Aliases.ps1 → home/Documents/WindowsPowerShell/Aliases.ps1 b/home/Documents/PowerShell/Aliases.ps1 → home/Documents/WindowsPowerShell/Aliases.ps1
diff --git a/home/Documents/PowerShell/Functions.ps1 → ...Documents/WindowsPowerShell/Functions.ps1 b/home/Documents/PowerShell/Functions.ps1 → ...Documents/WindowsPowerShell/Functions.ps1
diff --git a/.../Documents/PowerShell/Initialisations.ps1 → ...nts/WindowsPowerShell/Initialisations.ps1 b/.../Documents/PowerShell/Initialisations.ps1 → ...nts/WindowsPowerShell/Initialisations.ps1
diff --git a/home/Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1 b/home/Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1
@@ -0,0 +1,8 @@
+$WindowsPowershellProfileLocation = (
+    Split-Path -Path $Profile.CurrentUserCurrentHost -Parent
+)
+
+."$WindowsPowershellProfileLocation\Variables.ps1"
+."$WindowsPowershellProfileLocation\Initialisations.ps1"
+."$WindowsPowershellProfileLocation\Functions.ps1"
+."$WindowsPowershellProfileLocation\Aliases.ps1"
diff --git a/home/Documents/PowerShell/Variables.ps1 → ...Documents/WindowsPowerShell/Variables.ps1 b/home/Documents/PowerShell/Variables.ps1 → ...Documents/WindowsPowerShell/Variables.ps1
diff --git a/home/dot_local/windows_setup/Install-WindowsSetup.ps1 b/home/dot_local/windows_setup/Install-WindowsSetup.ps1
@@ -1,5 +1,5 @@
-."..\..\Documents\PowerShell\Functions.ps1"
-."..\..\Documents\PowerShell\Variables.ps1"
+."..\..\Documents\WindowsPowerShell\Functions.ps1"
+."..\..\Documents\WindowsPowerShell\Variables.ps1"
 
 # Install Scoop packages
 # NOTE: Scoop is the primary package manager for my environment

diff --git a/home/dot_local/windows_setup/Uninstall-WindowsSetup.ps1 b/home/dot_local/windows_setup/Uninstall-WindowsSetup.ps1
@@ -1,5 +1,5 @@
-."..\..\Documents\PowerShell\Functions.ps1"
-."..\..\Documents\PowerShell\Variables.ps1"
+."..\..\Documents\WindowsPowerShell\Functions.ps1"
+."..\..\Documents\WindowsPowerShell\Variables.ps1"
 
 # Cleaning up configuration
 Remove-EnvironmentVariablesSetup -Scope "User"  # Remove environment variables