diff --git a/03-user/40-defaults.sh b/03-user/40-defaults.sh index 8b3499e..8604016 100644 --- a/03-user/40-defaults.sh +++ b/03-user/40-defaults.sh @@ -10,6 +10,18 @@ fi # that claims inode/directory (e.g. easytag) wins. (arch_notes.md) xdg-mime default org.gnome.Nautilus.desktop inode/directory +# Default interface fonts = Adwaita (GNOME 48's default). Under a non-GNOME +# session nothing sets these, so libadwaita/GNOME apps (Nautilus, …) would fall +# back to generic Sans. gtk-*/settings.ini covers the GTK toolkit font; +# gsettings covers the document/monospace fonts read via dconf/the portal. +if command -v gsettings >/dev/null 2>&1; then + gsettings set org.gnome.desktop.interface font-name 'Adwaita Sans 11' \ + && gsettings set org.gnome.desktop.interface document-font-name 'Adwaita Sans 11' \ + && gsettings set org.gnome.desktop.interface monospace-font-name 'Adwaita Mono 11' \ + && info "interface fonts → Adwaita Sans / Mono" \ + || echo " skip: could not set gsettings interface fonts" +fi + # User services that ship as ~/.config/systemd/user units (from dotfiles). systemctl --user daemon-reload systemctl --user enable shairport-sync.service 2>/dev/null \ diff --git a/03-user/dotfiles/.config/fontconfig/fonts.conf b/03-user/dotfiles/.config/fontconfig/fonts.conf new file mode 100644 index 0000000..ac0fb54 --- /dev/null +++ b/03-user/dotfiles/.config/fontconfig/fonts.conf @@ -0,0 +1,15 @@ + + + + + + sans-serif + Adwaita Sans + + + monospace + Adwaita Mono + + diff --git a/03-user/dotfiles/.config/gtk-3.0/settings.ini b/03-user/dotfiles/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..5824cf5 --- /dev/null +++ b/03-user/dotfiles/.config/gtk-3.0/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-font-name = Adwaita Sans 11 diff --git a/03-user/dotfiles/.config/gtk-4.0/settings.ini b/03-user/dotfiles/.config/gtk-4.0/settings.ini new file mode 100644 index 0000000..5824cf5 --- /dev/null +++ b/03-user/dotfiles/.config/gtk-4.0/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-font-name = Adwaita Sans 11 diff --git a/03-user/dotfiles/.config/joplin-desktop/settings.json b/03-user/dotfiles/.config/joplin-desktop/settings.json index 0b76918..8208f80 100644 --- a/03-user/dotfiles/.config/joplin-desktop/settings.json +++ b/03-user/dotfiles/.config/joplin-desktop/settings.json @@ -26,8 +26,8 @@ "markdown.plugin.typographer": false, "showTrayIcon": true, "style.editor.fontSize": 15, - "style.editor.fontFamily": "SF Mono", - "style.editor.monospaceFontFamily": "SF Mono", + "style.editor.fontFamily": "Adwaita Mono", + "style.editor.monospaceFontFamily": "Adwaita Mono", "style.editor.contentMaxWidth": 0, "ui.layout": { "key": "root", diff --git a/03-user/dotfiles/.config/joplin-desktop/userchrome.css b/03-user/dotfiles/.config/joplin-desktop/userchrome.css index b2b7ecc..114711c 100644 --- a/03-user/dotfiles/.config/joplin-desktop/userchrome.css +++ b/03-user/dotfiles/.config/joplin-desktop/userchrome.css @@ -274,11 +274,11 @@ --g-primary-Background: var(--g-textBackgroundColor); --g-primary-Color: var(--g-textColor); --g-icon-size-factor: 1; - --g-font-family-system-rounded: "SF Pro Rounded", var(--s-font-family-system); - --g-font-family-system: "SF Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, sans-serif; - --g-font-family-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, + --g-font-family-system-rounded: "Adwaita Sans", var(--s-font-family-system); + --g-font-family-system: "Adwaita Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, sans-serif; + --g-font-family-mono: "Adwaita Mono", ui-monospace, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - --g-font-family-icons: "SF Pro"; + --g-font-family-icons: "Adwaita Sans"; --g-font-size--1: 1.1rem; --g-font-size-0: 1.2rem; --g-font-size-1: 1.4rem; @@ -1261,7 +1261,7 @@ body button { height: 1.8rem; } .tag-bar .icon-tags::before { - font-family: "SF Pro"; + font-family: "Adwaita Sans"; content: var(--s-icon-tag) !important; font-family: var(--s-font-family-icons) !important; vertical-align: middle; @@ -3555,18 +3555,18 @@ body#tinymce .inline-code *, :root { - --s-font-family-system: "SF Pro Display" !important; - --u-font-family-system: "SF Pro Display" !important; - font-family: "SF Pro Display" !important; + --s-font-family-system: "Adwaita Sans" !important; + --u-font-family-system: "Adwaita Sans" !important; + font-family: "Adwaita Sans" !important; } .rli-noteList div, .rli-noteList span, .rli-noteList a { - font-family: "SF Pro Display" !important; + font-family: "Adwaita Sans" !important; font-size: 1.35rem !important; } .rli-editor button span { - /*font-family: "SF Pro Display" !important;*/ + /*font-family: "Adwaita Sans" !important;*/ } .new-note-todo-buttons { diff --git a/03-user/dotfiles/.config/swaync/style.css b/03-user/dotfiles/.config/swaync/style.css index 534a504..e400e98 100644 --- a/03-user/dotfiles/.config/swaync/style.css +++ b/03-user/dotfiles/.config/swaync/style.css @@ -1,7 +1,7 @@ * { all: unset; font-size: 14px; - font-family: "SF Pro Display"; + font-family: "Adwaita Sans"; transition: 200ms; } diff --git a/03-user/dotfiles/.config/waybar/style.css b/03-user/dotfiles/.config/waybar/style.css index dd53511..cbe1498 100644 --- a/03-user/dotfiles/.config/waybar/style.css +++ b/03-user/dotfiles/.config/waybar/style.css @@ -1,8 +1,8 @@ * { border: none; border-radius: 0; - /*font-family: "SF Pro Display", "FontAwesome";*/ - font-family: "SF Mono", "FontAwesome"; + /*font-family: "Adwaita Sans", "FontAwesome";*/ + font-family: "Adwaita Mono", "FontAwesome"; font-weight: 600; font-size: 13px; min-height: 0; diff --git a/03-user/dotfiles/.config/waybar/style.css.bak b/03-user/dotfiles/.config/waybar/style.css.bak deleted file mode 100644 index 096302b..0000000 --- a/03-user/dotfiles/.config/waybar/style.css.bak +++ /dev/null @@ -1,167 +0,0 @@ -* { - border: none; - border-radius: 0; - font-family: "SF Display"; - font-weight: bold; - font-size: 12px; - min-height: 0; -} - -window#waybar { - background: rgba(21, 18, 27, 0); - color: #cdd6f4; -} - -tooltip { - background: #1e1e2e; - border-radius: 10px; - border-width: 2px; - border-style: solid; - border-color: #11111b; -} - -#workspaces button { - padding: 2px 5px; - color: #636777; - margin-right: 5px; -} - -#workspaces button.active { - background-color: #000; -} - -#workspaces button.focused { - color: #a6adc8; - background: #eba0ac; - border-radius: 10px; -} - -#workspaces button.urgent { - color: #11111b; - background: #a6e3a1; - border-radius: 10px; -} - -#workspaces button:hover { - background: #11111b; - color: #11111b; - border-radius: 5px; -} - -#custom-power_profile, -#custom-weather, -#custom-moon, -#custom-wallpaper, -#window, -#clock, -#battery, -#pulseaudio, -#network, -#bluetooth, -#temperature, -#cpu, -#memory, -#workspaces, -#tray, -#backlight { - background: #1e1e2e; - opacity: 0.8; - padding: 0px 10px; - /* margin: 3px 0px; */ - margin: 0px; - margin-top: 10px; - border: 1px solid #181825; -} - -#memory { - color: #eba0ac; -} - -#temperature { - border-radius: 10px 0px 0px 10px; -} - -#custom-temperature.critical { - color: #f00; -} - -#backlight { - border-radius: 10px 0px 0px 10px; -} - -#tray { - border-radius: 10px; - margin-right: 10px; -} - -#workspaces { - background: #1e1e2e; - border-radius: 10px; - margin-left: 10px; - padding-right: 0px; - padding-left: 5px; -} - -#custom-power_profile { - color: #a6e3a1; - border-left: 0px; - border-right: 0px; -} - -#window { - border-radius: 10px; - margin-left: 60px; - margin-right: 60px; -} - -#clock { - color: #fab387; - border-radius: 10px 0px 0px 10px; - margin-left: 10px; - border-right: 0px; -} - -#network { - color: #f9e2af; - border-radius: 10px 0px 0px 10px; - border-left: 0px; - border-right: 0px; -} - -#bluetooth { - color: #89b4fa; - border-radius: 0px 10px 10px 0px; - margin-right: 10px -} - -#pulseaudio { - color: #89b4fa; - border-left: 0px; - border-right: 0px; -} - -#pulseaudio.microphone { - color: #cba6f7; - border-left: 0px; - border-right: 0px; - border-radius: 0px 10px 10px 0px; - margin-right: 10px; -} - -#battery { - color: #a6e3a1; - border-radius: 0 10px 10px 0; - margin-right: 10px; - border-left: 0px; -} -#battery.warning { - color: #FFA500; -} -#battery.critical { - color: #F00; -} -#custom-moon { - border-radius: 0px 10px 10px 0px; - border-right: 0px; - margin-left: 0px; -} diff --git a/03-user/dotfiles/.config/wofi/style.css b/03-user/dotfiles/.config/wofi/style.css index 184c230..929d4f6 100644 --- a/03-user/dotfiles/.config/wofi/style.css +++ b/03-user/dotfiles/.config/wofi/style.css @@ -3,7 +3,7 @@ margin: 0px; border: 2px solid #bd93f9; background-color: rgba(40,42,54,.5); border-radius: 13px; -font-family: "SF Pro Display"; +font-family: "Adwaita Sans"; } #input {