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
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;
diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index c01747aa..b8aa13c1 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -13,20 +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
-{
-  nixos-rebuild-ng = keepNixOverride (
-    prev.nixos-rebuild-ng.override {
-      nix = nix-monitored;
-    }
-  );
-  nix-direnv = prev.nix-direnv.override {
-    nix = nix-monitored;
-  };
+lib.optionalAttrs (prev ? nixos-rebuild) {
+  nixos-rebuild = use-nix-monitored prev.nixos-rebuild;
+}
+// lib.optionalAttrs (prev ? nixos-rebuild-ng) {
+  nixos-rebuild-ng = use-nix-monitored prev.nixos-rebuild-ng;
+}
+// {
+  nix-direnv = use-nix-monitored prev.nix-direnv;
 }