even closer

clients/quadphone/overlays.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: {
-  lib,
-  pkgs,
-  ...
-}: {
   nixpkgs.overlays = [
     (_: super: {
       ruby_3_3 = super.ruby_3_3.overrideAttrs (old: {
@@ -16,10 +12,10 @@
         ];
       });
       gnome-user-share = super.gnome-user-share.overrideAttrs (old: {
-        postPatch = lib.optionalString (pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform) ''
+        postPatch = lib.optionalString (super.stdenv.buildPlatform != super.stdenv.hostPlatform) ''
           substituteInPlace src/meson.build \
-            --replace-fail "cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]" "cargo_options += [ '--target-dir', meson.project_build_root() / 'src', '--target=${pkgs.stdenv.hostPlatform.rust.rustcTarget}' ]" \
+            --replace-fail "cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]" "cargo_options += [ '--target-dir', meson.project_build_root() / 'src', '--target=${super.stdenv.hostPlatform.rust.rustcTarget}' ]" \
-            --replace-fail "'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@'," "'cp', 'src' / '${pkgs.stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(), '@OUTPUT@',"
+            --replace-fail "'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@'," "'cp', 'src' / '${super.stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(), '@OUTPUT@',"
         '';
       });
     })

flake.lock

@@ -1054,6 +1054,22 @@
         "type": "github"
       }
     },
+    "fontsCross": {
+      "locked": {
+        "lastModified": 1755477642,
+        "narHash": "sha256-sNX3Yl+9c5oFrbHiHHLFMdTei99s5DkYRHflxvlYRDQ=",
+        "owner": "Artturin",
+        "repo": "nixpkgs",
+        "rev": "371eef69fe2afce2175b8bd8a44e1daad99cefa2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Artturin",
+        "ref": "fontscross",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -2629,6 +2645,7 @@
         "disko": "disko",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-parts": "flake-parts",
+        "fontsCross": "fontsCross",
         "gnome-mobile": "gnome-mobile",
         "grapevine": "grapevine",
         "home-manager": "home-manager_2",

flake.nix

@@ -8,6 +8,7 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    fontsCross.url = "github:Artturin/nixpkgs/fontscross";
     run0-sudo-shim = {
       url = "github:lordgrimmauld/run0-sudo-shim";
       inputs.nixpkgs.follows = "nixpkgs";

modules/desktop/fonts.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  fonts = {
+    packages = with pkgs; [twitter-color-emoji];
+    fontconfig.defaultFonts.emoji = ["Twitter Color Emoji"];
+  };
+}

modules/graphical/fonts.nix

@@ -1,12 +1,11 @@
 {pkgs, ...}: {
   fonts = {
-    packages = with pkgs; [inter nerd-fonts.fira-code twitter-color-emoji];
+    packages = with pkgs; [inter nerd-fonts.fira-code];
     enableDefaultPackages = false;
     fontconfig.defaultFonts = rec {
       serif = ["Inter"];
       sansSerif = serif;
       monospace = ["FiraCode Nerd Font"];
-      emoji = ["Twitter Color Emoji"];
     };
   };
 }

modules/graphical/plymouth.nix

@@ -1 +0,0 @@
-{boot.plymouth.enable = true;}