nix/homeModules/common/fish/functions/nix-build.fish

@@ -1,5 +1,5 @@
 function nix-build
-      if type -q nom-build
+      if type -q nix-build
           nom-build $argv
       else
           nix-build $argv

nix/homeModules/common/fish/functions/nix-shell.fish

@@ -1,5 +1,5 @@
 function nix-shell
-      if type -q nom-shell
+      if type -q nix-shell
           nom-shell $argv
       else
           nix-shell $argv

nix/overlays/iosevka.nix

@@ -51,10 +51,9 @@ final: prev: rec {
       };
 
       weights = {
-        # Build 580, but indicate 400 in output
         Regular.shape = 580;
-        Regular.menu = 400;
+        Regular.menu = 580;
-        Regular.css = 400;
+        Regular.css = 580;
         Bold.shape = 700;
         Bold.menu = 700;
         Bold.css = 700;

nix/overlays/nix-monitored.nix

@@ -13,38 +13,20 @@ let
         withNotify = false;
       };
 
-  # * overrides the nix input as nix-monitored
+  keepNixOverride =
-  # * any override changing the nix input will change that to nix-monitored
-  use-nix-monitored =
     drv:
-    let
+    drv
-      drv' = drv.override { nix = nix-monitored; };
+    // {
-    in
+      override = args: drv.override (builtins.removeAttrs args [ "nix" ]);
-    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 = use-nix-monitored prev.nixos-rebuild;
+  nixos-rebuild-ng = keepNixOverride (
-}
+    prev.nixos-rebuild-ng.override {
-// lib.optionalAttrs (prev ? nixos-rebuild-ng) {
+      nix = nix-monitored;
-  nixos-rebuild-ng = use-nix-monitored prev.nixos-rebuild-ng;
+    }
-}
+  );
-// {
+  nix-direnv = prev.nix-direnv.override {
-  nix-direnv = use-nix-monitored prev.nix-direnv;
+    nix = nix-monitored;
+  };
 }