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

diff --git a/doc/cheatsheets/c64.md b/doc/c64.md
similarity index 100%
rename from doc/cheatsheets/c64.md
rename to doc/c64.md

diff --git a/doc/cheatsheets/docker.md b/doc/docker.md
similarity index 100%
rename from doc/cheatsheets/docker.md
rename to doc/docker.md

diff --git a/doc/cheatsheets/git.md b/doc/git.md
similarity index 100%
rename from doc/cheatsheets/git.md
rename to doc/git.md

diff --git a/doc/cheatsheets/paths.md b/doc/paths.md
similarity index 100%
rename from doc/cheatsheets/paths.md
rename to doc/paths.md

diff --git a/doc/cheatsheets/raspberry-pi.md b/doc/raspberry-pi.md
similarity index 100%
rename from doc/cheatsheets/raspberry-pi.md
rename to doc/raspberry-pi.md

diff --git a/doc/cheatsheets/rstudio.md b/doc/rstudio.md
similarity index 100%
rename from doc/cheatsheets/rstudio.md
rename to doc/rstudio.md

diff --git a/doc/cheatsheets/setup-i3.md b/doc/setup-i3.md
similarity index 100%
rename from doc/cheatsheets/setup-i3.md
rename to doc/setup-i3.md

diff --git a/doc/cheatsheets/vi.md b/doc/vi.md
similarity index 100%
rename from doc/cheatsheets/vi.md
rename to doc/vi.md

diff --git a/files/Microsoft.PowerShell_profile.ps1 b/files/Microsoft.PowerShell_profile.ps1
index e3d7719f62430ba93f7642f1b88b4a78b4e0b360..7aeb6925e10fc16d80dd3406741983bea9446e7f 100644 (file)
--- a/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@ -12,6 +12,10 @@ New-Alias pg    Enable-PoshGit
 
 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,9 +36,3 @@ 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

diff --git a/files/dashboard.ps1 b/files/dashboard.ps1
deleted file mode 100644 (file)
index 6012df2..0000000
--- a/files/dashboard.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dashboard
-New-Alias dash   Show-MyDashboard # from dash.psm1
-
-function Get-JournalAgenda() {
-       agenda.exe -path "$HOME/Journal/{YYYY}/{MM}-{DD}.md"
-}
-New-Alias today Get-JournalAgenda
\ No newline at end of file

diff --git a/psmodules/dash.psm1 b/psmodules/dash.psm1
index 874fc0e0b67eed7b6965d0ef48804a20af755743..0c84b120a1addc3625a8d56812d5161748e27bbb 100644 (file)
--- a/psmodules/dash.psm1
+++ b/psmodules/dash.psm1
@@ -2,28 +2,38 @@ function Get-JournalAgenda() {
     agenda.exe -path "$HOME/Journal/{YYYY}/{MM}-{DD}.md"
 }
 
+function Measure-JournalTodos() {
+       $todocount = todolist | Measure-Object -Line
+       $env:todocount += '|'
+       $env:todocount += $todocount.lines
+}
+
 function Show-MyDashBoard() {
+       param(
+               [bool]$gitHub=$false
+       )
        Write-Host ""
-       Write-Host "## Todo items for today:"
-       # Measure-JournalTodos
-       chart
-       # Get-JournalTodayTodos
+       Measure-JournalTodos
+       Write-Host "## Todo items for today: $env:todocount" 
+       chart -var todocount
        Write-Host ""
        Write-Host "## Agenda for today:"
        Get-JournalAgenda
        Write-Host ""
-       Write-Host "## GitHub Issues Assigned (Show-AgileMine)"
-       # Show-AgileMine
-       # Show-AgileMine -DaysAgo 6
-       Write-Host ""
-       Write-Host "## GitHub Issues with no milestone. (Select-AgileNoMilestone)"
-       Write-Host "(Get-AgileQuery -state 'Open' | Invoke-AgileQuery | Select-AgileNoMilestone | Show-MarkdownFromGitHub)"
-       $milestone_repos = $env:github_repos.split(' ') | Where-Object { $_ -Match 'techservicesillinois' }
-    # $queries = Get-AgileQuery -state 'Open' -repos $milestone_repos
-       # Invoke-AgileQuery -queries $queries | Select-AgileNoMilestone | Show-MarkdownFromGitHub
+       if($github) {
+               Write-Host "## GitHub Issues Assigned (Show-AgileMine)"
+               Show-AgileMine
+               Show-AgileMine -DaysAgo 6
+               Write-Host ""
+               Write-Host "## GitHub Issues with no milestone. (Select-AgileNoMilestone)"
+               Write-Host "(Get-AgileQuery -state 'Open' | Invoke-AgileQuery | Select-AgileNoMilestone | Show-MarkdownFromGitHub)"
+               $milestone_repos = $env:github_repos.split(' ') | Where-Object { $_ -Match 'techservicesillinois' }
+               $queries = Get-AgileQuery -state 'Open' -repos $milestone_repos
+               Invoke-AgileQuery -queries $queries | Select-AgileNoMilestone | Show-MarkdownFromGitHub
+       }
        Write-Host ""
-       Write-Host "Use command 'todo' to list more tasks."
-       Write-Host "Use command 'chart' to show todo item progress."
+       Write-Host "Use command 'todolist' to list more tasks."
+       Write-Host "Use command 'chart -var todocount' to show todo item progress."
        Write-Host "Use command 'agenda' to list the plan for today."
 }