From a35f7b653073d9596aa44c67e1384b71e38c8e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 4 Jan 2026 15:54:05 +0100
Subject: [PATCH 1/5] home/fish: fix nix-* functions check

---
 nix/homeModules/common/fish/functions/nix-build.fish | 2 +-
 nix/homeModules/common/fish/functions/nix-shell.fish | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/homeModules/common/fish/functions/nix-build.fish b/nix/homeModules/common/fish/functions/nix-build.fish
index 4f541a72..8b074641 100644
--- a/nix/homeModules/common/fish/functions/nix-build.fish
+++ b/nix/homeModules/common/fish/functions/nix-build.fish
@@ -1,5 +1,5 @@
 function nix-build
-      if type -q nix-build
+      if type -q nom-build
           nom-build $argv
       else
           nix-build $argv
diff --git a/nix/homeModules/common/fish/functions/nix-shell.fish b/nix/homeModules/common/fish/functions/nix-shell.fish
index a615057f..b108e9ed 100644
--- a/nix/homeModules/common/fish/functions/nix-shell.fish
+++ b/nix/homeModules/common/fish/functions/nix-shell.fish
@@ -1,5 +1,5 @@
 function nix-shell
-      if type -q nix-shell
+      if type -q nom-shell
           nom-shell $argv
       else
           nix-shell $argv

From c7a942e971d64cdb482d1fd66e7966a5fa01e964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 4 Jan 2026 17:59:30 +0100
Subject: [PATCH 2/5] overlays/nix-monitored: also override nixos-rebuild

---
 nix/overlays/nix-monitored.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index c01747aa..af3d170f 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -21,6 +21,11 @@ let
     };
 in
 {
+  nixos-rebuild = keepNixOverride (
+    prev.nixos-rebuild.override {
+      nix = nix-monitored;
+    }
+  );
   nixos-rebuild-ng = keepNixOverride (
     prev.nixos-rebuild-ng.override {
       nix = nix-monitored;

From 5f665b4f556a6bb1edef57b2a98ce8b745469fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 4 Jan 2026 18:01:58 +0100
Subject: [PATCH 3/5] overlays/nix-monitored: optional nixos-rebuild

---
 nix/overlays/nix-monitored.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index af3d170f..47d5ee9a 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -19,18 +19,24 @@ let
     // {
       override = args: drv.override (builtins.removeAttrs args [ "nix" ]);
     };
+
+  inherit (prev) lib;
 in
-{
+lib.optionalAttrs (prev ? nixos-rebuild) {
   nixos-rebuild = keepNixOverride (
     prev.nixos-rebuild.override {
       nix = nix-monitored;
     }
   );
+}
+// lib.optionalAttrs (prev ? nixos-rebuild-ng) {
   nixos-rebuild-ng = keepNixOverride (
     prev.nixos-rebuild-ng.override {
       nix = nix-monitored;
     }
   );
+}
+// {
   nix-direnv = prev.nix-direnv.override {
     nix = nix-monitored;
   };

From 5946ddc87a87995b7c90805011de8d0415527ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 4 Jan 2026 20:05:28 +0100
Subject: [PATCH 4/5] overlays/nix-monitored: fix chained override

---
 nix/overlays/nix-monitored.nix | 41 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index 47d5ee9a..b8aa13c1 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -13,31 +13,38 @@ let
         withNotify = false;
       };
 
-  keepNixOverride =
+  # * overrides the nix input as nix-monitored
+  # * any override changing the nix input will change that to nix-monitored
+  use-nix-monitored =
     drv:
-    drv
-    // {
-      override = args: drv.override (builtins.removeAttrs args [ "nix" ]);
+    let
+      drv' = drv.override { nix = nix-monitored; };
+    in
+    drv'
+    // rec {
+      override =
+        args:
+        let
+          args' =
+            if args ? nix then
+              args
+              // {
+                nix = nix-monitored.override { inherit (args) nix; };
+              }
+            else
+              args;
+        in
+        (drv'.override args') // { inherit override; };
     };
 
   inherit (prev) lib;
 in
 lib.optionalAttrs (prev ? nixos-rebuild) {
-  nixos-rebuild = keepNixOverride (
-    prev.nixos-rebuild.override {
-      nix = nix-monitored;
-    }
-  );
+  nixos-rebuild = use-nix-monitored prev.nixos-rebuild;
 }
 // lib.optionalAttrs (prev ? nixos-rebuild-ng) {
-  nixos-rebuild-ng = keepNixOverride (
-    prev.nixos-rebuild-ng.override {
-      nix = nix-monitored;
-    }
-  );
+  nixos-rebuild-ng = use-nix-monitored prev.nixos-rebuild-ng;
 }
 // {
-  nix-direnv = prev.nix-direnv.override {
-    nix = nix-monitored;
-  };
+  nix-direnv = use-nix-monitored prev.nix-direnv;
 }

From 904c554f77a87b65c05dc1e1c6ab077de5ecff1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 4 Jan 2026 21:46:22 +0100
Subject: [PATCH 5/5] overlays/iosevka: fake built weight for Regular

---
 nix/overlays/iosevka.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nix/overlays/iosevka.nix b/nix/overlays/iosevka.nix
index b161be51..a22bf34b 100644
--- a/nix/overlays/iosevka.nix
+++ b/nix/overlays/iosevka.nix
@@ -51,9 +51,10 @@ final: prev: rec {
       };
 
       weights = {
+        # Build 580, but indicate 400 in output
         Regular.shape = 580;
-        Regular.menu = 580;
-        Regular.css = 580;
+        Regular.menu = 400;
+        Regular.css = 400;
         Bold.shape = 700;
         Bold.menu = 700;
         Bold.css = 700;