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

diff --git a/old/bootstrap.ps1 b/old/bootstrap.ps1
deleted file mode 100644 (file)
index 13ce10f..0000000
--- a/old/bootstrap.ps1
+++ /dev/null
@@ -1,69 +0,0 @@
-<#
-.SYNOPSIS
-
-Setup my Windows PowerShell environment.
-
-.DESCRIPTION
-
-.NOTES
-
-Relies heavily on the Chocolatey package manager.
-
-#>
-
-param(
-  # [Parameter(Mandatory=$true, HelpMessage="Install Development Tools")]
-  [switch]$dev_tools,
-  # [Parameter(Mandatory=$true, HelpMessage="Install Modeling Tools")]
-  [switch]$archi,
-  # [Parameter(Mandatory=$true, HelpMessage="Install Vim")]
-  [switch]$vim,
-  # [Parameter(Mandatory=$true, HelpMessage="Setup PowerShell Profile")]
-  [switch]$profile,
-  [switch]$fav_ps_modules
-)
-
-## Install SSH client
-Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
-
-## Always Install Chocolatey if missing
-$testchoco = powershell choco -v
-if(-not($testchoco)){
-  Write-Output "Seems Chocolatey is not installed, installing now..."
-  Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-}
-
-# OWASP ZAP for web application security scanning
-if($false) {
-  choco install zap
-}
-
-## TODO: Can I set this via command line: chrome://flags/#enable-force-dark 
-
-if($doBootStrap) {
-  # DONE!
-  New-Item -ItemType File -Path $doneFlagFile
-}
-
-# ArchiMate for enterprise modeling
-if($archi) {
-  choco install archi
-}
-
-# Install dev tools
-if($dev_tools){
-  ./install/dev.ps1
-}
-
-if($vim){
-  ./install/vim.ps1
-}
-
-if($profile){
-  ./install/profile.ps1
-}
-
-if($fav_ps_modules) {
-  Write-Host "Reminder: Need to install these modules with admin escalation."
-  ./install/admin/favorite-ps-modules.ps1
-}

diff --git a/install/art.sh b/pi/install/art.sh
similarity index 100%
rename from install/art.sh
rename to pi/install/art.sh

diff --git a/install/code.sh b/pi/install/code.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/code.sh
rename to pi/install/code.sh

diff --git a/install/exfat_pi.sh b/pi/install/exfat_pi.sh
similarity index 100%
rename from install/exfat_pi.sh
rename to pi/install/exfat_pi.sh

diff --git a/install/geek-life_pi.sh b/pi/install/geek-life_pi.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/geek-life_pi.sh
rename to pi/install/geek-life_pi.sh

diff --git a/install/i3.sh b/pi/install/i3.sh
similarity index 100%
rename from install/i3.sh
rename to pi/install/i3.sh

diff --git a/pi/install_i3_basics.sh b/pi/install/i3_basics.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from pi/install_i3_basics.sh
rename to pi/install/i3_basics.sh

diff --git a/install/powershell7_pi.sh b/pi/install/powershell7_pi.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/powershell7_pi.sh
rename to pi/install/powershell7_pi.sh

diff --git a/install/pi/rdp.sh b/pi/install/rdp.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/pi/rdp.sh
rename to pi/install/rdp.sh

diff --git a/install/website.sh b/pi/install/website.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/website.sh
rename to pi/install/website.sh

diff --git a/install/wtfutil_pi.sh b/pi/install/wtfutil_pi.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/wtfutil_pi.sh
rename to pi/install/wtfutil_pi.sh

diff --git a/pi/x16_deps.sh b/pi/install/x16_deps.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from pi/x16_deps.sh
rename to pi/install/x16_deps.sh

diff --git a/install/retropi.ps1 b/pi/setup/retropi_joystick_selection.ps1
similarity index 98%
rename from install/retropi.ps1
rename to pi/setup/retropi_joystick_selection.ps1
index d0b9518167b41b73815f4aa02f40ac829612a5c4..114d048315c72ecffd5e290c976042333219e13a 100644 (file)
--- a/install/retropi.ps1
+++ b/pi/setup/retropi_joystick_selection.ps1
@@ -1,7 +1,7 @@
-\r
-## TODO: Would be clever to make this a DSC module: https://docs.microsoft.com/en-us/powershell/scripting/dsc/quickstarts/website-quickstart?view=powershell-7\r
-Write-Host "Adding ability to switch Joystick"\r
-# https://github.com/meleu/RetroPie-joystick-selection\r
-Write-Host "Enable SSH first via Raspi-Config"\r
-ssh pi@retropi -C 'wget -O- "https://raw.githubusercontent.com/meleu/RetroPie-joystick-selection/master/install.sh" | sudo bash'\r
+
+## TODO: Would be clever to make this a DSC module: https://docs.microsoft.com/en-us/powershell/scripting/dsc/quickstarts/website-quickstart?view=powershell-7
+Write-Host "Adding ability to switch Joystick"
+# https://github.com/meleu/RetroPie-joystick-selection
+Write-Host "Enable SSH first via Raspi-Config"
+ssh pi@retropi -C 'wget -O- "https://raw.githubusercontent.com/meleu/RetroPie-joystick-selection/master/install.sh" | sudo bash'
 Write-Host "Now launch the script via RetroPi Setup - Configuration Tools - Joystick selection"
\ No newline at end of file

diff --git a/install/vice_pi.sh b/pi/setup/vice_pi.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from install/vice_pi.sh
rename to pi/setup/vice_pi.sh

diff --git a/pi/x16.sh b/pi/setup/x16.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from pi/x16.sh
rename to pi/setup/x16.sh

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

diff --git a/install/ansible.ps1 b/win/install/ansible.ps1
similarity index 100%
rename from install/ansible.ps1
rename to win/install/ansible.ps1

diff --git a/install/dev.ps1 b/win/install/dev.ps1
similarity index 100%
rename from install/dev.ps1
rename to win/install/dev.ps1

diff --git a/install/vim.ps1 b/win/install/vim.ps1
similarity index 90%
rename from install/vim.ps1
rename to win/install/vim.ps1
index fc1739764ea7a901f79be03449e3e562ce0f84a3..3f48cda25fbbe73de431564f56d4e89949e4a422 100644 (file)
--- a/install/vim.ps1
+++ b/win/install/vim.ps1
@@ -1,12 +1,12 @@
-<#\r
-.SYNOPSIS\r
-\r
-Install Vim for Windows\r
-\r
-.NOTES\r
-\r
-Requires Chocolatey package manager.\r
-\r
-#>\r
-\r
+<#
+.SYNOPSIS
+
+Install Vim for Windows
+
+.NOTES
+
+Requires Chocolatey package manager.
+
+#>
+
 choco install vim
\ No newline at end of file

diff --git a/win/more.md b/win/more.md
new file mode 100644 (file)
index 0000000..bb9f7ba
--- /dev/null
+++ b/win/more.md
@@ -0,0 +1,6 @@
+
+Archimate
+`choco install archi`
+
+OWASP Zap
+`choco install zap`
\ No newline at end of file

diff --git a/win/rdp.md b/win/rdp.md
new file mode 100644 (file)
index 0000000..f0c3d08
--- /dev/null
+++ b/win/rdp.md
@@ -0,0 +1,9 @@
+
+Enable incoming RDP.
+```powershell
+Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server'-name "fDenyTSConnections" -Value 0
+Enable-NetFirewallRule -DisplayGroup "Remote Desktop"
+Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp' -name "UserAuthentication" -Value 1
+```
+
+Now reboot.
\ No newline at end of file

diff --git a/install/minion.ps1 b/win/setup/minion.ps1
similarity index 98%
rename from install/minion.ps1
rename to win/setup/minion.ps1
index 1898187a54a1b590247dac141fe3b77f3158f151..089f380bc1dc2ef09846083450ecddad01b490a9 100644 (file)
--- a/install/minion.ps1
+++ b/win/setup/minion.ps1
@@ -1,2 +1,2 @@
-cd c:\src\r
+cd c:\src
 git clone https://github.com/edthedev/minion.git
\ No newline at end of file

diff --git a/start_windows.md b/win/start_windows.md
similarity index 100%
rename from start_windows.md
rename to win/start_windows.md