From: Edward Delaporte <delaport@illinois.edu>
Date: Thu, 9 Dec 2021 21:20:46 +0000 (-0600)
Subject: Merge branch 'main' of github.com:edthedev/dotfiles into main
X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/commitdiff_plain/7deb20931eb32532cfc8b5029e73145c7545a2d5?hp=-c

Merge branch 'main' of github.com:edthedev/dotfiles into main
---

7deb20931eb32532cfc8b5029e73145c7545a2d5
diff --combined Microsoft.PowerShell_profile.ps1
index 7e159fd,738e133..ea01aae
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@@ -30,7 -30,11 +30,11 @@@ if($IsWindows)
  	$ENV:PATH+=";C:\Program Files (x86)\GnuWin32\bin" # GNU Utils - i.e. rm
  	$ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
  }
- 
+ else {
+ 	$ENV:PATH+=":$HOME/x16/x16-emulator" # x16 Emulator
+ 	$ENV:PATH+=":$HOME/src/x16-demo/tools" # x16 python tools
+ }
+ # alias renumber $HOME/src/x16-demo/
  
  $env:Journal = "~\Journal\2021" # allows cd $env:journal
  $env:minion = "$env:src\minion"
@@@ -40,9 -44,6 +44,9 @@@
  $modPaths = Get-Childitem -Path "$env:src\dotfiles\psmodules"
  $modPaths += Get-Childitem -Path "$env:minion\psmodule"
  
 +# https://github.com/uillinois-community/powershell-scripts
 +$modPaths += Get-Childitem -Path "$env:src\powershell-scripts\modules"
 +
  # Windows Only Modules
  if($IsWindows){
  	$modPaths += Get-Childitem -Path "$env:src\dotfiles\win_psmodules"
@@@ -52,10 -53,8 +56,10 @@@ if($modPaths.length -eq 0)
  }
  $modPaths | ForEach-Object {
  	$fileName = $_.FullName
 -	Import-Module $fileName
 -	Write-Host ">> Loaded $fileName"
 +	if($filename -Like "*.psm1") {
 +		Import-Module $fileName
 +		Write-Host ">> Loaded $fileName"
 +	}
  }
  
  
@@@ -72,7 -71,9 +76,9 @@@ Set-PSReadlineOption -HistorySavePath $
  . $env:minion\profiles\path.ps1
  # Add Minion to path
  Write-Host "+ Added minion command to path."
- $ENV:PATH+=";$env:minion\go" # Flag to ensure my profile kicked in.
+ if($IsWindows){
+ 	$ENV:PATH+=";$env:minion\go" # Flag to ensure my profile kicked in.
+ }
  
  # Unix dies hard.
  New-Alias which get-command
@@@ -105,12 -106,6 +111,12 @@@ function Get-GitStatus() 
  	git status -b --short
  }
  
 +# Tell my scripts which GitHub repositories to look in.
 +$env:GITHUB_USERNAME = 'edthedev'
 +$env:GITHUB_ORG = 'techservicesillinois'
 +$env:GITHUB_REPOS = @('SecOps-Tools', 'secdev-job-aids', 
 +	'awscli-login', 'farmit')
 +
  # Nice for git
  New-Alias ol 		Get-GitLog
  New-Alias st 		Get-GitStatus