Update links to point at new URL & branch

* Add 1Password install step
* Add Scoop install step
* Remove SSH key generation step
* Make 1Password, Hyper-V, Containers, and SSH Server steps optional
* Refactor to run Scoop install as unelevated then relaunch as elevated
  for remaining tasks

README.md

@@ -7,31 +7,31 @@ Bootstrap an OS instance with bare essentials.
 To bootstrap a macOS instance:
 
 ```console
-$ curl -O https://code.infektor.net/config/bootstrap/raw/master/bootstrap-macOS.sh && chmod +x bootstrap-macOS.sh && ./bootstrap-macOS.sh
+$ curl -O https://git.infektor.net/config/bootstrap/raw/main/bootstrap-macOS.sh && chmod +x bootstrap-macOS.sh && ./bootstrap-macOS.sh
 ```
 
 To bootstrap a Debian based Linux instance:
 
 ```console
-$ wget https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Debian.sh && chmod +x bootstrap-Debian.sh && ./bootstrap-Debian.sh
+$ wget https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Debian.sh && chmod +x bootstrap-Debian.sh && ./bootstrap-Debian.sh
 ```
 
 To bootstrap a Arch Linux based instance:
 
 ```console
-$ curl -O https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Arch.sh && chmod +x bootstrap-Arch.sh && ./bootstrap-Arch.sh
+$ curl -O https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Arch.sh && chmod +x bootstrap-Arch.sh && ./bootstrap-Arch.sh
 ```
 
 To bootstrap a Fedora Linux instance:
 
 ```console
-$ curl -O https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Fedora.sh && chmod +x bootstrap-Fedora.sh && ./bootstrap-Fedora.sh
+$ curl -O https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Fedora.sh && chmod +x bootstrap-Fedora.sh && ./bootstrap-Fedora.sh
 ```
 
 To bootstrap a Windows instance:
 
 ```console
-$ Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Windows.ps1'))
+$ Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-WebRequest -Uri "https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Windows.ps1" -OutFile "./bootstrap-Windows.ps1"; ./bootstrap-Windows.ps1
 ```
 
 ## Package
@@ -40,6 +40,6 @@ Install as a pip package to set SSH keys on any of GitHub, GitLab, BitBucket
 Cloud, or Gogs servers:
 
 ```console
-$ pip install git+https://code.infektor.net/config/bootstrap.git
+$ pip install git+https://git.infektor.net/config/bootstrap.git
 $ python -c 'import bootstrap; bootstrap.set_ssh_keys()'
 ```

bootstrap-Windows.ps1

@@ -1,26 +1,65 @@
-[CmdletBinding()]
-Param(
-  [Parameter(Mandatory=$true)]
-  [String]$email,
-  [String]$sshKeyType = "ed25519"
-)
+$IsElevated = [bool]([Security.Principal.WindowsPrincipal] `
+  [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")
+$Choices = '&Yes', '&No'
+
+if (-Not $IsElevated) {
+  Write-Host "Not running as Administrator. Performing unprivileged actions."
+
+  # Install Scoop
+  Write-Host "`nInstall Scoop"
+  $ScoopInstaller = "$env:USERPROFILE/Downloads/ScoopInstaller.ps1"
+  Invoke-WebRequest -Uri https://get.scoop.sh -OutFile $ScoopInstaller
+  &$ScoopInstaller -ScoopDir "$env:LocalAppData/Scoop" -ScoopGlobalDir "$env:ProgramData/Scoop"
+
+  $Decision = $Host.UI.PromptForChoice('Relaunch as Administrator', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    $Bootstrap = $MyInvocation.MyCommand.Path
+    Start-Process powershell.exe "-ExecutionPolicy ByPass -NoProfile -File $Bootstrap" -Verb RunAs
+  }
+} else {
+  Write-Host "Running as Administrator. Performing privileged actions."
+
+  # Install 1Password
+  $Decision = $Host.UI.PromptForChoice('Install 1Password', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    $1passwordInstaller = "$env:USERPROFILE/Downloads/1PasswordSetup-latest.exe"
+    Invoke-WebRequest -Uri "https://downloads.1password.com/win/1PasswordSetup-latest.exe" -OutFile "$1passwordInstaller"
+    &$1passwordInstaller
+    Remove-Item $1passwordInstaller
+  } else {
+    echo 'Skipping 1Password'
+  }
+
+  # Enable Hyper-V
+  $Decision = $Host.UI.PromptForChoice('Enable Hyper-V', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
+  } else {
+    echo 'Skipping Hyper-V'
+  }
+
+  # Enable Containters
+  $Decision = $Host.UI.PromptForChoice('Enable Containers', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    Enable-WindowsOptionalFeature -Online -FeatureName Containers -All
+  } else {
+    echo 'Skipping Containers'
+  }
 
   # Install Chocolatey
-Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+  Write-Host "`nInstall Chocolatey"
+  iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 
-# Enable Hyper-V and containters
-Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
-Enable-WindowsOptionalFeature -Online -FeatureName Containers -All
-
-# Install OpenSSH and start service
+  # Install SSH Server
+  $Decision = $Host.UI.PromptForChoice('Install SSH Server', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
     choco install --yes "--package-parameters=/SSHServerFeature" openssh
     Start-Service sshd
     Set-Service -Name sshd -StartupType 'Automatic'
+  } else {
+    echo 'Skipping SSH Server'
+  }
 
-# generate keys and authorize them
-ssh-keygen -t "$sshKeyType" -C "$email" -f "$env:USERPROFILE/.ssh/$sshKeyType"
-# TODO: authorize public key for admin
-
-# Install Windows-Terminal and Debian
-choco install --yes microsoft-windows-terminal
-wsl --install --distribution Debia
+  Write-Host 'Press any key to continue...'
+  [System.Console]::ReadKey($true)
+}