From 37a6783d523de9f103bbb845de07d8ecd9fc8325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 27 Mar 2024 11:29:19 +0100
Subject: [PATCH] feat: change font stuff

---
 home/programs/neovide.toml       | 12 +++++++++++-
 home/programs/nixvim/default.nix | 11 -----------
 hosts/MONSTER/default.nix        | 24 +-----------------------
 hosts/MONSTER/fontconfig.xml     | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 35 deletions(-)
 create mode 100644 hosts/MONSTER/fontconfig.xml

diff --git a/home/programs/neovide.toml b/home/programs/neovide.toml
index 444b259..379bfa5 100644
--- a/home/programs/neovide.toml
+++ b/home/programs/neovide.toml
@@ -6,4 +6,14 @@ size = 16
 edging = "subpixelantialias"
 
 [font.features]
-"FiraCode Nerd Font" = ["+zero", "+onum", "+ss04", "+cv19", "+cv23", "+ss09", "+cv27", "+ss06", "+ss07", "+ss10"]
+"FiraCode Nerd Font" = [
+  "+zero",
+  "+onum",
+  "+ss04",
+  "+cv19",
+  "+cv23",
+  "+ss09",
+  "+ss06",
+  "+ss07",
+  "+ss10",
+]
diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix
index 739b2d9..f4e0f25 100644
--- a/home/programs/nixvim/default.nix
+++ b/home/programs/nixvim/default.nix
@@ -21,16 +21,6 @@ let
       '';
     };
   };
-  lualine-so-fancy = pkgs.vimUtils.buildVimPlugin {
-    name = "lualine-so-fancy";
-    version = "2128450";
-    src = pkgs.fetchFromGitHub {
-      owner = "meuter";
-      repo = "lualine-so-fancy.nvim";
-      rev = "21284504fed2776668fdea8743a528774de5d2e1";
-      hash = "sha256-JMz3Dv3poGoYQU+iq/jtgyHECZLx+6mLCvqUex/a0SY=";
-    };
-  };
 in {
   enable = true;
   defaultEditor = true;
@@ -456,7 +446,6 @@ in {
   ];
   extraPlugins = with pkgs.vimPlugins; [
     vim-mergetool
-    lualine-so-fancy
     darkman
     rest-nvim
     plenary-nvim
diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix
index 744fab1..894df3b 100644
--- a/hosts/MONSTER/default.nix
+++ b/hosts/MONSTER/default.nix
@@ -206,29 +206,7 @@
         monospace = [ "FiraCode Nerd Font" ];
         sansSerif = [ "Noto Sans Nerd Font" ];
       };
-
-      localConf =
-        # xml
-        ''
-          <match target="font">
-            <test name="family" compare="contains">
-              <string>Fira</string>
-            </test>
-            <edit name="fontfeatures" mode="append">
-              <string>zero</string>
-              <string>onum</string>
-              <string>ss04</string>
-              <string>cv19</string>
-              <string>cv23</string>
-              <string>ss09</string>
-              <string>cv27</string>
-              <string>ss06</string>
-              <string>ss07</string>
-              <string>ss10</string>
-            </edit>
-          </match>
-        '';
-
+      localConf = builtins.readFile ./fontconfig.xml;
       subpixel.rgba = "bgr";
     };
   };
diff --git a/hosts/MONSTER/fontconfig.xml b/hosts/MONSTER/fontconfig.xml
new file mode 100644
index 0000000..86d032c
--- /dev/null
+++ b/hosts/MONSTER/fontconfig.xml
@@ -0,0 +1,17 @@
+<match target="font">
+  <test name="family" compare="contains">
+    <string>Fira</string>
+  </test>
+  <!-- https://github.com/tonsky/FiraCode/wiki/How-to-enable-stylistic-sets -->
+  <edit name="fontfeatures" mode="append">
+    <string>zero</string>
+    <string>onum</string>
+    <string>ss04</string>
+    <string>cv19</string>
+    <string>cv23</string>
+    <string>ss09</string>
+    <string>ss06</string>
+    <string>ss07</string>
+    <string>ss10</string>
+  </edit>
+</match>