Fixes and cleanup

[dotfiles.git] / files / Microsoft.PowerShell_profile.ps1

diff --git a/files/Microsoft.PowerShell_profile.ps1 b/files/Microsoft.PowerShell_profile.ps1
index 3cbce8b66be0f43090e899dc4a344936f5f751b3..b14b695f24c690241c84e4d75849895e46e932e0 100644 (file)
--- a/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@ -1,4 +1,4 @@
-#WebDriverException: Message: unknown error: cannot determine loading status .EXAMPLE
+#WebDriverException: Message: nknown error: cannot determine loading status .EXAMPLE
 # . C:\src\dotfiles\Microsoft.PowerShell_profile.ps1
 
 # Courtesty of MKletz
@@ -8,85 +8,31 @@
 #}
 # $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
 
-$env:src = "~\src"
-if($IsWindows){
-  $env:src = "c:\src"
-}
-
-if($IsWindows){
-       # Some Paths that are annoying to find/restore if the installer fails
-       $ENV:PATH+=";$env:src\bin" # anything else I need
-       $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:\bin\x16emu" # Package management is nice.
-       $ENV:PATH+=";C:\Program Files (x86)\GnuWin32\bin" # GNU Utils - i.e. rm
-       $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
-       $ENV:PATH+=";$env:src\x16-demo\tools" # x16 python tools
-       $ENV:PATH+=";$env:src\flutter\bin" # Flutter for Dart
-}
-else {
-       $ENV:PATH+=";$env:src/bin" # anything else I need
-       $ENV:PATH+=":$HOME/x16/x16-emulator" # x16 Emulator
-       $ENV:PATH+=":$HOME/src/x16-demo/tools" # x16 python tools
+function Add-ToProfile {
+    param (
+        $Path
+    )
+       $profileContents = [string]::join([environment]::newline, (get-content -path $Path))
+       invoke-expression $profileContents
 }
 
-# Command line tools
-$ENV:PATH+=";$env:src\chart" # command line chart utility edthedev\chart
-$ENV:PATH+=";$env:src\agenda" # command line chart utility edthedev\chart
-$ENV:PATH+=";$env:src\todolist" # todo list utility edthedev\todolist
-$env:todolist = "C:\Users\delaport\Journal\"
-# New-Alias todo      todolist
-
-# alias renumber $HOME/src/x16-demo/
-
-$env:Journal = "~\Journal" # allows cd $env:journal
-$env:minion = "$env:src\minion"
-
-# Import some home grown PowerShell modules, if they are installed.
-#
-$modPaths = Get-Childitem -ErrorAction Ignore -Path "$env:src\dotfiles\psmodules"
-$modPaths += Get-Childitem -ErrorAction Ignore -Path "$env:minion\psmodule"
 
-# https://github.com/uillinois-community/powershell-scripts
-$modPaths += Get-Childitem -ErrorAction Ignore -Path "$env:src\powershell-scripts\modules"
-
-# Windows Only Modules
+$env:src = "~\src"
 if($IsWindows){
-       $modPaths += Get-Childitem -ErrorAction Ignore -Path "$env:src\dotfiles\win_psmodules"
-}
-if($modPaths.length -eq 0){
-       Write-Host "No modules found."
-}
-$modPaths | ForEach-Object {
-       $fileName = $_.FullName
-       if($filename -Like "*.psm1") {
-               Import-Module $fileName
-               Write-Host ">> Loaded $fileName"
-       }
+  $env:src = "c:\src"
 }
 
+Add-ToProfile $env:src\dotfiles\files\paths.ps1
+Add-ToProfile $env:src\dotfiles\files\env.ps1
 
+# You can pry my unix commands out of my cold dead fingers
+Set-Alias which get-command
 
 # Linux-like up/down in shell
 Set-PSReadlineKeyHandler -Key UpArrow -Function HistorySearchBackward 
 Set-PSReadlineKeyHandler -Key DownArrow -Function HistorySearchForward 
 Set-PSReadlineOption -HistorySavePath $env:src\PSHistory.log
 
-# Minion alias commands - 'today'
-# . C:\src\minion\profiles\alias.ps1
-# . $env:minion\profiles\alias.ps1
-# Add Minion go executable to path.
-# . $env:minion\profiles\path.ps1
-# Add Minion to path
-# Write-Host "+ Added minion command to path."
-# if($IsWindows){
-#      $ENV:PATH+=";$env:minion\go" # Flag to ensure my profile kicked in.
-# }
-
-# Unix dies hard.
-New-Alias which get-command
-
 # Delay loading PoshGit for speed. 
 function Enable-PoshGit {
        Import-Module posh-git
@@ -94,14 +40,6 @@ function Enable-PoshGit {
 New-Alias pg    Enable-PoshGit
 Write-Host "+ Type 'pg' to enable PoshGit"
 
-function Invoke-X16Emu {
-       param(
-               [string]$File
-       )
-       x16emu.exe -bas $File -keymap en-us
-}
-
-New-Alias x16   Invoke-X16Emu
 
 if((Get-Location).Path -eq $HOME){
        cd $env:src
@@ -145,3 +83,5 @@ New-Alias today Get-JournalAgenda
 function Invoke-FixWslVPN {
        Get-NetAdapter | Where-Object {$_.InterfaceDescription -Match "Cisco AnyConnect Secure Mobility Client Virtual Miniport Adapter for Windows x64"} | Set-NetIPInterface -InterfaceMetric 6000
 }
+
+# Write-Host "Real profile file is at $env:realProfile ($$env:realProfile)"
\ No newline at end of file