fix(darwin): resolve nodejs-related build issues

common/system/default.nix

@@ -3,12 +3,13 @@
   pkgs,
   ...
 }: {
-  nix.gc = {
+  nix = {
+    gc = {
       automatic = true;
       options = "--delete-older-than 30d";
     };
-  nix.optimise.automatic = true;
+    optimise.automatic = true;
-  nix.settings = {
+    settings = {
       extra-experimental-features = [
         "flakes"
         "nix-command"
@@ -21,7 +22,16 @@
         config.my.user
       ];
     };
-  nix.package = pkgs.nix;
+    package = pkgs.nix;
+  };
+
+  environment.systemPackages = with pkgs; [
+    unstable.nh
+  ];
+
+  # TODO: make sure hostnames always match flake output name
+  environment.variables."NH_FLAKE" = ''${config.hm.home.homeDirectory}/Projects/nix-dots'';
+
   programs.zsh.enable = true;
   time.timeZone = "America/New_York";
 }

darwin/sketchybar/default.nix

@@ -16,7 +16,7 @@ in {
     hm.my.sketchybar.enable = true;
 
     fonts.packages = with pkgs; [
-      sketchybar-app-font
+      unstable.sketchybar-app-font
     ];
   };
 }

flakes/darwin.nix

@@ -30,7 +30,7 @@
     );
 in {
   flake.darwinConfigurations = {
-    mac = mkDarwin {
+    neptune = mkDarwin {
       modules = [
         {
           hm = import ../user/environments/mac/home.nix;

overlays/default.nix

@@ -1,7 +1,4 @@
 {inputs, ...}: {
-  rust-overlay = inputs.rust-overlay.overlays.default;
-  vscode-extensions = inputs.nix-vscode-extensions.overlays.default;
-
   # This one brings our custom packages from the 'pkgs' directory
   additions = final: prev:
     {
@@ -17,13 +14,18 @@
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
-  modifications = final: prev:
+  modifications = final: prev: {
-    if prev.stdenv.isDarwin
+    # address build failure on darwin, remove after 25.05
-    then {
+    nodejs_20-slim = prev.nodejs-slim_22;
-      # avoid build failure on darwin
+    nodejs_20 = prev.nodejs_22;
-      inherit (final.unstable) ghostscript;
+    nodejs-slim = prev.nodejs-slim_22;
-    }
+    nodejs = prev.nodejs_22;
-    else {};
+  };
+
+  # External overlays
+  # Included after the above to ensure modifications are applied
+  rust-overlay = inputs.rust-overlay.overlays.default;
+  vscode-extensions = inputs.nix-vscode-extensions.overlays.default;
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'

pkgs/nvim/default.nix

@@ -8,7 +8,7 @@
   icons = import ./config/icons.nix;
   pkgsMaster = inputs.master.legacyPackages.${system};
   nixvimModule = {
-    pkgs = inputs.nixpkgs.legacyPackages.${system};
+    inherit pkgs;
     module = import ./config;
     extraSpecialArgs = {inherit icons pkgsMaster;};
   };