From 8a2100ace889a98371186d7d0b8d2fa2cfbd8293 Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Sun, 24 Nov 2024 13:20:43 +0530
Subject: [PATCH] skipper: testing smc fonts flake

---
 flake.lock                | 78 +++++++++++++++++++++++++++++++++++++--
 flake.nix                 |  2 +
 hosts/skipper/default.nix |  6 +--
 3 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8ac641d..496ead1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -289,6 +289,24 @@
         "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_6": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
       "original": {
         "owner": "numtide",
         "ref": "main",
@@ -653,6 +671,22 @@
       }
     },
     "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1731763621,
         "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
@@ -668,7 +702,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1729755165,
         "narHash": "sha256-6IpnOHWsaSSjT3yvqlrWfHW6HVCT+wOAlUpcooGJ+FQ=",
@@ -723,6 +757,7 @@
         "lix-module": "lix-module",
         "neovim-nightly": "neovim-nightly",
         "nixpkgs": "nixpkgs_6",
+        "smc-fonts": "smc-fonts",
         "sops-nix": "sops-nix",
         "wiki": "wiki"
       }
@@ -748,9 +783,29 @@
         "type": "github"
       }
     },
+    "smc-fonts": {
+      "inputs": {
+        "flake-utils": "flake-utils_5",
+        "nixpkgs": "nixpkgs_7"
+      },
+      "locked": {
+        "lastModified": 1731189279,
+        "narHash": "sha256-+EMNlF+XC9rjqtiGfA+XIpqVJVUWlfFVd9vWojsRMrE=",
+        "owner": "smc",
+        "repo": "smc-fonts-flake",
+        "rev": "e87f739bb36425c224fde441bf81b2f0484e99ef",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "smc",
+        "ref": "trunk",
+        "repo": "smc-fonts-flake",
+        "type": "gitlab"
+      }
+    },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1732186149,
@@ -857,6 +912,21 @@
         "type": "github"
       }
     },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems_3"
@@ -877,8 +947,8 @@
     },
     "wiki": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_8"
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
         "lastModified": 1729817327,
diff --git a/flake.nix b/flake.nix
index e7b1ead..eeafa59 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,7 @@
     caddy.url = "git+https://git.acomputer.lol/adtya/caddy-with-modules?ref=main";
     adtyaxyz.url = "git+https://git.acomputer.lol/adtya/adtya.xyz?ref=main";
     wiki.url = "git+https://git.acomputer.lol/adtya/wiki?ref=main";
+    smc-fonts.url = "gitlab:smc/smc-fonts-flake?ref=trunk";
   };
 
   outputs =
@@ -49,6 +50,7 @@
     , caddy
     , adtyaxyz
     , wiki
+    , smc-fonts
     ,
     } @ inputs:
     let
diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix
index cd7d163..5121ce4 100644
--- a/hosts/skipper/default.nix
+++ b/hosts/skipper/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ inputs, pkgs, ... }: {
   imports = [
     ./boot
     ./hardware
@@ -17,14 +17,14 @@
     NIXOS_OZONE_WL = 1;
   };
 
-  fonts = {
+  fonts = let smc-fonts = inputs.smc-fonts.packages.${pkgs.system}.default; in {
     packages = with pkgs; [
       cantarell-fonts
       dejavu_fonts
       liberation_ttf
       noto-fonts-cjk-sans
       noto-fonts-emoji
-      smc-chilanka
+      (smc-fonts.override { fonts = [ "chilanka" ]; })
       (nerdfonts.override { fonts = [ "FiraCode" ]; })
     ];
   };