...

1 files changed, 26 insertions, 28 deletions

diff --git a/hosts/vidhar/borg/default.nix b/hosts/vidhar/borg/default.nix
index 8d0b46ef..7672de18 100644
--- a/hosts/vidhar/borg/default.nix
+++ b/hosts/vidhar/borg/default.nix
@@ -26,7 +26,7 @@ let
   in nameValuePair serviceName {
     serviceConfig = {
       Type = "oneshot";
-      ExecStart = "${copyBorg}/bin/copy ${escapeShellArg repo} yggdrasil.borgbase:repo";
+      ExecStart = "${copyBorg}/bin/copy_borg --verbosity 3 ${escapeShellArg repo} yggdrasil.borgbase:repo";
       TimeoutStartSec = "8h";
       # User = "borg";
       # Group = "borg";
@@ -43,40 +43,38 @@ let
         "BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes"
         "BORG_HOSTNAME_IS_UNIQUE=yes"
       ];
+
+      LogRateLimitIntervalSec = 0;
     };
   };
 
-  copyBorg = pkgs.stdenv.mkDerivation (let
-    packageOverrides = pkgs.callPackage ./pyprctl-packages.nix {};
-    inpPython = pkgs.python39.override { inherit packageOverrides; };
-  in rec {
-    name = "copy";
-    src = ./copy.py;
-
-    phases = ["buildPhase" "checkPhase" "installPhase"];
-
-    buildInputs = with pkgs; [makeWrapper];
-
-    python = inpPython.withPackages (ps: with ps; [humanize tqdm python-dateutil xdg python-unshare pyprctl halo]);
-
-    buildPhase = ''
-      substitute $src copy \
-        --subst-var-by python ${escapeShellArg python}
+  copyBorg = flakeInputs.mach-nix.lib.${config.nixpkgs.system}.buildPythonPackage rec {
+    pname = "copy-borg";
+    src = ./copy;
+    version = "0.0.0";
+    ignoreDataOutdated = true;
+
+    requirements = ''
+      humanize
+      tqdm
+      python-dateutil
+      xdg
+      python-unshare
+      pyprctl
+      halo
     '';
-
-    doCheck = true;
-    checkPhase = ''
-      ${python}/bin/python -m py_compile copy
+    postInstall = ''
+      wrapProgram $out/bin/copy_borg \
+        --prefix PATH : ${makeBinPath (with pkgs; [util-linux borgbackup])}:${config.security.wrapperDir}
     '';
 
-    installPhase = ''
-      install -m 0755 -D -t $out/bin \
-        copy
+    providers.python-unshare = "nixpkgs";
+    overridesPre = [
+      (self: super: { python-unshare = super.python-unshare.overrideAttrs (oldAttrs: { name = "python-unshare-0.2.1"; version = "0.2.1"; }); })
+    ];
 
-      wrapProgram $out/bin/copy \
-        --prefix PATH : ${makeBinPath (with pkgs; [util-linux borgbackup])}:${config.security.wrapperDir}
-    '';
-  });
+    # _.tomli.buildInputs.add = with pkgs."python3Packages"; [ flit-core ];
+  };
 in {
   config = {
     services.borgsnap = {