Only register user fonts that we installed

Close #19 Signed-off-by: Christopher Larson <kergoth@gmail.com>
kergoth · Jan 20, 2024 · 7673dea · 7673dea
1 parent d334d8d
commit 7673dea
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/scripts/setup-user-windows.ps1 b/scripts/setup-user-windows.ps1
@@ -116,7 +116,7 @@ if (Test-Path "C:\Program Files\SyncTrayzor") {
 }
 
 # Install fonts
-. $PSScriptRoot\windows\install-fonts.ps1
+. $PSScriptRoot\windows\register-fonts.ps1
 
 # Apply my dotfiles
 $env:DOTFILES_DIR = $PSScriptRoot | Split-Path -Parent

diff --git a/scripts/windows/install-fonts.ps1 → scripts/windows/register-fonts.ps1 b/scripts/windows/install-fonts.ps1 → scripts/windows/register-fonts.ps1
@@ -1,5 +1,5 @@
 # https://www.alkanesolutions.co.uk/2021/12/06/installing-fonts-with-powershell/
-function Install-Font {
+function Register-Font {
     param
     (
         [System.IO.FileInfo]$fontFile
@@ -32,8 +32,20 @@ function Install-Font {
 Add-Type -AssemblyName PresentationCore
 
 Write-Output "Adding user fonts to the registry"
+
 $FontsPath = Join-Path -Path ([Environment]::GetFolderPath('LocalApplicationData')) -ChildPath 'Microsoft\Windows\Fonts'
-foreach ($FontItem in (Get-ChildItem -Path $FontsPath |
-            Where-Object { ($_.Name -like '*.ttf') -or ($_.Name -like '*.otf') })) {
-    Install-Font -fontFile $FontItem.FullName
+if (Get-Command -Name chezmoi -ErrorAction SilentlyContinue) {
+    $fonts = chezmoi data |
+        ConvertFrom-Json |
+        Select-Object -ExpandProperty fonts |
+        ForEach-Object { Join-Path $FontsPath $_ }
+}
+else {
+    $fonts = Get-ChildItem -Path $FontsPath |
+        Where-Object { ($_.Name -like '*.ttf') -or ($_.Name -like '*.otf') } |
+        ForEach-Object { $_.FullName }
+}
+
+foreach ($font in $fonts) {
+    Register-Font -fontFile $font
 }