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

diff --combined files/Microsoft.PowerShell_profile.ps1
index 4b70fe83950fa9bc26ddeefe9567e16109b45e0d,742accade523759989298bc29848e2fe7434a264..04d9c45c1fc10a753e81db3f29a8b25c1d8916a1
--- 1/files/Microsoft.PowerShell_profile.ps1
--- 2/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@@ -1,8 -1,8 +1,8 @@@
- $env:src = "~\src"
- Import-Module $env:src\dotfiles\psmodules\add_to_profile.psm1
- Add-ToProfile $env:src\dotfiles\files\paths.ps1
- Add-ToProfile $env:src\dotfiles\files\env.ps1
- Add-ToProfile $env:src\dotfiles\files\load_modules.ps1
+ $env:src = "$HOME\src"
+ $env:dotfiles = "$HOME\dotfiles"
+ Import-Module $env:dotfiles\psmodules\add_to_profile.psm1
+ Add-ToProfile $env:dotfiles\files\paths.ps1
+ Add-ToProfile $env:dotfiles\files\env.ps1
  
  # Delay loading PoshGit for speed. 
  function Enable-PoshGit {
@@@ -22,11 -22,12 +22,18 @@@ Set-PSReadlineOption -EditMode V
  
  Write-Host "+ Type 'pg' to enable PoshGit"
  Write-Host 'See $env:realProfile for version controlled profile file.'
+ 
+ # Load some modules
+ $env:psmodules = "$env:dotfiles\psmodules"
+ Import-Module "$env:psmodules\dash.psm1"
+ Import-Module $env:PSModules\file_management.psm1
+ Import-Module "$env:psmodules\fix_vpn.psm1"
+ 
  # Let's face it, I'm about to cd into my source directory
  if((Get-Location).Path -eq $HOME){ cd $env:src }
- New-Alias today Get-JournalAgenda
 +
 +function Get-JournalAgenda() {
 +    # Write-Host "Reading from $HOME\Journal\{YYYY}\{MM}-{DD}.md"
 +    agenda.exe -path "$HOME\Journal\{YYYY}\{MM}-{DD}.md"
 +}
++New-Alias today Get-JournalAgenda