feat(fontconfig): add fontconfig and aliases

9 files changed, 45 insertions, 5 deletions

diff --git a/alacritty/.config/alacritty/defaults.toml b/alacritty/.config/alacritty/defaults.toml
index 0a42544..3fd1d99 100644
--- a/alacritty/.config/alacritty/defaults.toml
+++ b/alacritty/.config/alacritty/defaults.toml
@@ -8,7 +8,7 @@ opacity = 0.95
 
 [font]
 size = 15
-normal = { family = "Hack Nerd Font" }
+normal = { family = "monospace" }
 
 [mouse]
 hide_when_typing = true
diff --git a/bemenu/.config/profile.d/50-bemenu.sh b/bemenu/.config/profile.d/50-bemenu.sh
index fa86b16..f867f0e 100644
--- a/bemenu/.config/profile.d/50-bemenu.sh
+++ b/bemenu/.config/profile.d/50-bemenu.sh
@@ -25,7 +25,7 @@ export BEMENU_OPTS="--ignorecase \
 --line-height 18 \
 --binding vim \
 --vim-esc-exits \
---fn 'Hack Nerd Font 15' \
+--fn 'sans-serif 15' \
 --no-overlap \
 --ab '$base02' \
 --af '$base06' \
diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
index 7129a95..6acf4a8 100644
--- a/dunst/.config/dunst/dunstrc
+++ b/dunst/.config/dunst/dunstrc
@@ -6,7 +6,7 @@
     notification_limit = 20
     frame_color = "#fe8019"
     idle_threshold = 120
-    font = Hack Font 15
+    font = sans-serif 15
     markup = full
     icon_path = /usr/share/icons
     enable_recursive_icon_lookup = true
diff --git a/fontconfig/.config/fontconfig/fonts.conf b/fontconfig/.config/fontconfig/fonts.conf
new file mode 100644
index 0000000..f523219
--- /dev/null
+++ b/fontconfig/.config/fontconfig/fonts.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+    <alias>
+        <family>sans-serif</family>
+        <prefer>
+            <family>DejaVu Sans</family>
+            <family>Noto Sans</family>
+        </prefer>
+    </alias>
+
+    <alias>
+        <family>serif</family>
+        <prefer>
+            <family>DejaVu Serif</family>
+            <family>Noto Serif</family>
+        </prefer>
+    </alias>
+
+    <alias>
+        <family>monospace</family>
+        <prefer>
+            <family>Hack</family>
+        </prefer>
+    </alias>
+</fontconfig>
diff --git a/nvim/.config/nvim/after/ftplugin/xml.lua b/nvim/.config/nvim/after/ftplugin/xml.lua
new file mode 100644
index 0000000..a57e4ed
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/xml.lua
@@ -0,0 +1 @@
+vim.bo.formatexpr = nil
diff --git a/nvim/.config/nvim/lua/tobyvin/filetype.lua b/nvim/.config/nvim/lua/tobyvin/filetype.lua
index 734602d..f82e6b9 100644
--- a/nvim/.config/nvim/lua/tobyvin/filetype.lua
+++ b/nvim/.config/nvim/lua/tobyvin/filetype.lua
@@ -10,6 +10,11 @@ vim.filetype.add({
 		tridactylrc = "trytactylrc",
 	},
 	pattern = {
+		-- fontconfig
+		[".*/fontconfig/fonts%.conf"] = "xml",
+		[".*/fontconfig/conf%.d/.*%.conf"] = "xml",
+		[".*/usr/share/fontconfig/fonts%.conf"] = "xml",
+		[".*/usr/share/fontconfig/conf%..*/.*%.conf"] = "xml",
 		-- sway drop-ins
 		[".*/sway/config%.d/.*%.conf"] = "swayconfig",
 		[".*/%.sway/config%.d/.*%.conf"] = "swayconfig",
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index 52863a9..8c59719 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -55,6 +55,13 @@ local M = {
 			"htmldjango",
 		},
 	},
+	lemminx = {
+		settings = {
+			xml = {
+				catalogs = { "/etc/xml/catalog" },
+			},
+		},
+	},
 	lua_ls = {
 		settings = {
 			Lua = {
diff --git a/nvim/.config/nvim/mason-lock.json b/nvim/.config/nvim/mason-lock.json
index 2bfb134..1248eff 100644
--- a/nvim/.config/nvim/mason-lock.json
+++ b/nvim/.config/nvim/mason-lock.json
@@ -1,6 +1,7 @@
 {
   "bash-language-server": "5.1.2",
   "biome": "1.5.3",
+  "lemminx": "0.26.1",
   "lua-language-server": "3.7.4",
   "prettier": "3.2.5",
   "selene": "0.26.1",
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 88998e6..4ca18ff 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -31,7 +31,7 @@ client.urgent           $base08 $base08 $base00 $base08 $base08
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base07
 
-font pango:Hack Nerd Font 15
+font pango:sans-serif 15
 focus_on_window_activation focus
 default_border pixel
 hide_edge_borders smart
@@ -163,7 +163,7 @@ mode 'resize' {
 
 bar {
     status_command i3status-rs
-    font pango:Hack Nerd Font 15
+    font pango:monospace 15
     tray_padding 5
     colors {
         background $base00