From 1b1fd42b61eaa3d3f23ded19e82172ccaf0a6e2a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 27 Mar 2025 15:06:44 +0100 Subject: [PATCH] home/git: use upstream git-maintenance units --- home/programs/git/default.nix | 6 +-- home/programs/git/maintenance-timers.nix | 56 ------------------------ 2 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 home/programs/git/maintenance-timers.nix diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix index 0f0b889..861d896 100644 --- a/home/programs/git/default.nix +++ b/home/programs/git/default.nix @@ -14,10 +14,6 @@ let ]; in { - imports = [ - ./maintenance-timers.nix - ]; - # TODO: convert to template once nix-sops supports it in hm module sops.secrets."git/nordicsemi-config" = { }; @@ -35,6 +31,8 @@ in signByDefault = true; }; + maintenance.enable = true; + lfs.enable = true; delta = { diff --git a/home/programs/git/maintenance-timers.nix b/home/programs/git/maintenance-timers.nix deleted file mode 100644 index 118d806..0000000 --- a/home/programs/git/maintenance-timers.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ config, pkgs, lib, ... }: -let - cfg = config.programs.git; -in -{ - systemd.user.services."git-maintenance@" = { - Unit = { - Description = "Optimize Git repositories data"; - Documentation = [ "man:git-maintenance(1)" ]; - }; - - Service = { - Type = "oneshot"; - ExecStart = "${lib.getExe pkgs.git} for-each-repo --config=maintenance.repo maintenance run --no-quiet --schedule=%i"; - - Environment = [ - "PATH=${lib.makeBinPath (with pkgs; [ cfg.package openssh ])}" - ]; - - LockPersonality = "yes"; - MemoryDenyWriteExecute = "yes"; - NoNewPrivileges = "yes"; - RestrictAddressFamilies = [ - "AF_UNIX" - "AF_INET" - "AF_INET6" - "AF_VSOCK" - ]; - RestrictNamespaces = "yes"; - RestrictRealtime = "yes"; - RestrictSUIDSGID = "yes"; - SystemCallArchitectures = "native"; - SystemCallFilter = "@system-service"; - }; - }; - - systemd.user.timers."git-maintenance@" = { - Unit = { - Description = "Optimize Git repositories data"; - Documentation = [ "man:git-maintenance(1)" ]; - }; - - Timer = { - Persistent = true; - OnCalendar = "%i"; - }; - - Install = { - WantedBy = [ "timers.target" ]; - }; - }; - - systemd.user.timers."git-maintenance@hourly".Timer.OnCalendar = "*-*-* 1..23:05:00"; - systemd.user.timers."git-maintenance@daily".Timer.OnCalendar = "Tue..Sun *-*-* 0:05:00"; - systemd.user.timers."git-maintenance@weekly".Timer.OnCalendar = "Mon 0:05:00"; -}