diff --git a/desktop/fontconfig/60-fonts-source-han-mono.conf b/desktop/fontconfig/60-fonts-noto-mono.conf similarity index 87% rename from desktop/fontconfig/60-fonts-source-han-mono.conf rename to desktop/fontconfig/60-fonts-noto-mono.conf index e8a5347..7e42855 100644 --- a/desktop/fontconfig/60-fonts-source-han-mono.conf +++ b/desktop/fontconfig/60-fonts-noto-mono.conf @@ -6,7 +6,7 @@ monospace - Source Han Mono + Noto Mono diff --git a/desktop/install b/desktop/install index 5e36814..9904f04 100755 --- a/desktop/install +++ b/desktop/install @@ -15,20 +15,14 @@ function install_gsettings() { dconf load "$gsettings_dir" } -function install_source_han_mono_fonts() { +function install_fonts() { local uid local home - local fonts_dir local fontconfig_dir uid=${SUDO_UID:-$(id -u)} home=$(eval "echo ~${SUDO_USER:-}") - fonts_dir="$home/.local/share/fonts" fontconfig_dir="$home/.config/fontconfig/conf.d" - sudo --user="#$uid" mkdir -p "$fonts_dir" "$fontconfig_dir" - sudo --user="#$uid" \ - curl \ - -fsSL https://github.com/adobe-fonts/source-han-mono/releases/download/1.002/SourceHanMono.ttc \ - -o "$fonts_dir/SourceHanMono.ttc" + sudo --user="#$uid" mkdir -p "$fontconfig_dir" sudo --user="#$uid" \ rsync -rv fontconfig/ "$fontconfig_dir/" fc-cache @@ -50,5 +44,5 @@ function install_environment_d() { install_apt_packages install_gsettings settings.ini / install_gsettings terminal-settings.ini "/org/gnome/terminal/legacy/profiles:/:$(gsettings get org.gnome.Terminal.ProfilesList default | tr -d \')/" -install_source_han_mono_fonts +install_fonts install_environment_d