From: Edward Delaporte <delaport@illinois.edu>
Date: Tue, 21 Nov 2023 16:11:40 +0000 (-0600)
Subject: Merge branches 'main' and 'main' of github.com:edthedev/dotfiles
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/89a871d580aa28e16d00f7820b87f5225f53b2d1?ds=sidebyside;hp=-c

Merge branches 'main' and 'main' of github.com:edthedev/dotfiles
---

89a871d580aa28e16d00f7820b87f5225f53b2d1
diff --combined files/Microsoft.PowerShell_profile.ps1
index 583496c,e3d7719..7aeb692
--- a/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@@ -12,10 -12,6 +12,10 @@@ New-Alias pg    Enable-PoshGi
  
  Set-Alias code codium  # Prefer Codium
  
 +# Dashboard
 +New-Alias dash   Show-MyDashboard # from dash.psm1
 +New-Alias today Get-JournalAgenda
 +
  # You can pry my unix commands out of my cold dead fingers
  Set-Alias which get-command
  # Reject Windows heritage, act like Vi
@@@ -32,6 -28,13 +32,7 @@@ $env:psmodules = "$env:dotfiles\psmodul
  Import-Module "$env:psmodules\dash.psm1"
  Import-Module $env:PSModules\file_management.psm1
  Import-Module "$env:psmodules\fix_vpn.psm1"
+ Import-Module $env:PSModules\house_shopping.psm1
  
  # Let's face it, I'm about to cd into my source directory
  if((Get-Location).Path -eq $HOME){ cd $env:src }
 -
 -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