Down to one page of PSProfile!

diff --git a/files/Microsoft.PowerShell_profile.ps1 b/files/Microsoft.PowerShell_profile.ps1
index b14b695f24c690241c84e4d75849895e46e932e0..ca6cfd66bf7b67e2765d16307a9a1bc1395d7d35 100644 (file)
--- a/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@ -1,29 +1,9 @@
-#WebDriverException: Message: nknown error: cannot determine loading status .EXAMPLE
-# . C:\src\dotfiles\Microsoft.PowerShell_profile.ps1
-
-# Courtesty of MKletz
-# Get-ChildItem -Path 'C:\Repos' -Filter "*.psd1" -Recurse | ForEach-Object -Process {
-#     $Path = Split-Path -Path $_.Directory -Parent
-#     $env:PSModulePath = $env:PSModulePath + ";$($Path)"
-#}
-# $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
-
-function Add-ToProfile {
-    param (
-        $Path
-    )
-       $profileContents = [string]::join([environment]::newline, (get-content -path $Path))
-       invoke-expression $profileContents
-}
-

 
 $env:src = "~\src"
 
 $env:src = "~\src"

-if($IsWindows){
-  $env:src = "c:\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\paths.ps1
 Add-ToProfile $env:src\dotfiles\files\env.ps1

+Add-ToProfile $env:src\dotfiles\files\load_modules.ps1

 
 # You can pry my unix commands out of my cold dead fingers
 Set-Alias which get-command
 
 # You can pry my unix commands out of my cold dead fingers
 Set-Alias which get-command


@@ -40,38 +20,11 @@ function Enable-PoshGit {
 New-Alias pg    Enable-PoshGit
 Write-Host "+ Type 'pg' to enable PoshGit"
 
 New-Alias pg    Enable-PoshGit
 Write-Host "+ Type 'pg' to enable PoshGit"
 

-
+# Let's face it, I'm about to cd into my source directory

 if((Get-Location).Path -eq $HOME){
        cd $env:src
 }
 
 if((Get-Location).Path -eq $HOME){
        cd $env:src
 }
 

-function Get-GitLog() {
-       git log --oneline
-}
-
-function Get-GitStatus() {
-       git status -b --short
-}
-
-# Tell my scripts which GitHub repositories to look in.
-$env:GITHUB_USERNAME = 'edthedev'
-$env:GITHUB_REPOS = @(
-       'techservicesillinois/SecOps-Tools', 
-       'techservicesillinois/secdev-job-aids', 
-       'techservicesillinois/awscli-login', 
-       'techservicesillinois/farmit',
-       'uillinois-community/uillinois-community.github.io',
-       'techservicesillinois/SecOps-Powershell-CSOC',
-       'techservicesillinois/SecOps-Powershell-CISDSC',
-       'techservicesillinois/secops-splunk-null-router'
-) -join ' '
-$ENV:TS_REPOS = $ENV:GITHUB_REPOS.split(' ') | Where { $_ -like 'techser*' }
-
-
-# Nice for git
-New-Alias ol           Get-GitLog
-New-Alias st           Get-GitStatus
-

 # Dashboard
 New-Alias dash   Show-MyDashboard # from dash.psm1
 
 # Dashboard
 New-Alias dash   Show-MyDashboard # from dash.psm1
 


@@ -79,9 +32,4 @@ function Get-JournalAgenda() {
        agenda.exe -path "$HOME/Journal/{YYYY}/{MM}-{DD}.md"
 }
 New-Alias today Get-JournalAgenda
        agenda.exe -path "$HOME/Journal/{YYYY}/{MM}-{DD}.md"
 }
 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
 # Write-Host "Real profile file is at $env:realProfile ($$env:realProfile)"
\ No newline at end of file

diff --git a/files/env.ps1 b/files/env.ps1
index ed2904e52d86ea0b5c81004c58b6f20d99d27486..d27bd8ca69c4bc02e29f6388709cc645f72b996f 100644 (file)
--- a/files/env.ps1
+++ b/files/env.ps1
@@ -1,2 +1,16 @@
 $env:Journal = "~\Journal" # allows cd $env:journal
 $env:Journal = "~\Journal" # allows cd $env:journal

-$env:todolist = "C:\Users\delaport\Journal\"
\ No newline at end of file
+$env:todolist = "C:\Users\delaport\Journal\"
+# Tell my scripts which GitHub repositories to look in.
+$env:GITHUB_USERNAME = 'edthedev'
+$env:GITHUB_REPOS = @(
+       'techservicesillinois/SecOps-Tools', 
+       'techservicesillinois/secdev-job-aids', 
+       'techservicesillinois/awscli-login', 
+       'techservicesillinois/farmit',
+       'uillinois-community/uillinois-community.github.io',
+       'techservicesillinois/SecOps-Powershell-CSOC',
+       'techservicesillinois/SecOps-Powershell-CISDSC',
+       'techservicesillinois/secops-splunk-null-router'
+) -join ' '
+$ENV:TS_REPOS = $ENV:GITHUB_REPOS.split(' ') | Where { $_ -like 'techser*' }
+

diff --git a/files/load_modules.ps1 b/files/load_modules.ps1
index 210415c94483359762f0c583d29919fe36a39bd9..380480258b2666c9f425d3e93f827452bd4f80e7 100644 (file)
--- a/files/load_modules.ps1
+++ b/files/load_modules.ps1
@@ -1,3 +1,5 @@
+

 $modPath = "$env:src\dotfiles\psmodules"
 Import-Module "$modPath\dash.psm1"
 $modPath = "$env:src\dotfiles\psmodules"
 Import-Module "$modPath\dash.psm1"

-Import-Module "$modPath\drivespace.psm1"
\ No newline at end of file
+Import-Module "$modPath\drivespace.psm1"
+Import-Module "$modPath\fix_vpn.psm1"
\ No newline at end of file

diff --git a/psmodules/add_to_profile.psm1 b/psmodules/add_to_profile.psm1
new file mode 100644 (file)
index 0000000..4223f65
--- /dev/null
+++ b/psmodules/add_to_profile.psm1
@@ -0,0 +1,8 @@
+function Add-ToProfile {
+    param (
+        $Path
+    )
+       $profileContents = [string]::join([environment]::newline, (get-content -path $Path))
+       invoke-expression $profileContents
+}
+Export-ModuleMember -Function Add-ToProfile
\ No newline at end of file

diff --git a/psmodules/fix_vpn.psm1 b/psmodules/fix_vpn.psm1
new file mode 100644 (file)
index 0000000..d8b2e57
--- /dev/null
+++ b/psmodules/fix_vpn.psm1
@@ -0,0 +1,4 @@
+function Invoke-FixWslVPN {
+       Get-NetAdapter | Where-Object {$_.InterfaceDescription -Match "Cisco AnyConnect Secure Mobility Client Virtual Miniport Adapter for Windows x64"} | Set-NetIPInterface -InterfaceMetric 6000
+}
+Export-ModuleMember -Function Invoke-FixWslVPN
\ No newline at end of file

diff --git a/psmodules/git_cleverness.psm1 b/psmodules/git_cleverness.psm1
new file mode 100644 (file)
index 0000000..c5a9eee
--- /dev/null
+++ b/psmodules/git_cleverness.psm1
@@ -0,0 +1,7 @@
+function Get-GitLog() {
+       git log --oneline
+}
+
+function Get-GitStatus() {
+       git status -b --short
+}