From 8fd5d8fbd41a3fb41b72fe9f7e89f379210fe05f Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 11 Apr 2023 15:39:27 +0200
Subject: [PATCH] frumar: znapzend frumar-new dataset

---
 flake.nix                         | 2 +-
 home-manager/home.nix             | 1 +
 nixos/machines/frumar/default.nix | 3 +++
 pkgs/default.nix                  | 4 +++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index ca1b70b..dc64f46 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,7 +95,6 @@
           nixpkgs-mozilla.overlay
           emacs-overlay.overlay
           agenix.overlay
-          nix-npm-buildpackage.overlays.default
           (import ./fixups.nix)
           (import ./pkgs)
           (import ./pkgs/mdr.nix)
@@ -106,6 +105,7 @@
               overlays = [ ];
             };
             flake-inputs = inputs;
+            nix-npm-buildpackage = nix-npm-buildpackage.legacyPackages."${final.system}";
           })
           (import ./nixos/overlay.nix)
         ];
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a8122d2..8f89f52 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -173,6 +173,7 @@ in {
     borgbackup
     bup
     # catdoc
+    # todo (upgrade): trurl
     expect
     fzf
     fx
diff --git a/nixos/machines/frumar/default.nix b/nixos/machines/frumar/default.nix
index 5788cb9..f21891c 100644
--- a/nixos/machines/frumar/default.nix
+++ b/nixos/machines/frumar/default.nix
@@ -269,6 +269,9 @@
       sendRaw = true;
     };
     zetup = {
+      "frumar-new" = {
+        plan = "1w=>6h,1m=>1w,1y=>1m,2y=>6m,50y=>1y";
+      };
       "frumar-new/plexmedia" = {
         plan = "1w=>6h,1m=>1w,1y=>1m,2y=>6m,50y=>1y";
       };
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 6bbde10..e037c00 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -34,7 +34,9 @@
     '';
   });
   wayland-push-to-talk-fix = self.callPackage ./wayland-push-to-talk-fix.nix {};
-  y-deployer = self.callPackage ../deployer/package.nix {};
+  y-deployer = self.callPackage ../deployer/package.nix {
+    inherit (self.nix-npm-buildpackage) buildYarnPackage;
+  };
   grott = self.callPackage ./grott.nix {};
   python3 = super.python3.override {
     packageOverrides = pyself: pysuper: {