From b5b2d884470df9cfab87aeed8494844b462ecf59 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 6 Jun 2022 22:03:28 +0200 Subject: [PATCH] install git-revise --- flake.lock | 18 +++++++++--------- profiles/base/default.nix | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index bb5ce3a..dfc0433 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ }, "nixos-2205": { "locked": { - "lastModified": 1654005557, - "narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=", + "lastModified": 1654360807, + "narHash": "sha256-wYG86PUkPZ1P/oHsCpepTkb/U26poaEPPp1XFjRsgdA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08950a6e29cf7bddee466592eb790a417550f7f9", + "rev": "d9794b04bffb468b886c553557489977ae5f4c65", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nur": { "locked": { - "lastModified": 1654123271, - "narHash": "sha256-xM85/VFYu8I8jZiZ7U0CmZO/98sHO7+f7PIMxQVZXCM=", + "lastModified": 1654539919, + "narHash": "sha256-sl7Kxw5yc7RikHcKBLz4NRdnmI9fWkJL+MwoeJPF6pE=", "owner": "nix-community", "repo": "NUR", - "rev": "4c83235ccca7cfcf34fee9f49023f21c0e9db128", + "rev": "9ca7fbf9104f063ae6584ab2445d740d8b809b5a", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "unstable": { "locked": { - "lastModified": 1654007547, - "narHash": "sha256-G812EeXZeGeGjkAvbTleGwcKFCGxdLOQb9aViOWASPc=", + "lastModified": 1654398695, + "narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5643714dea562f0161529ab23058562afeff46d0", + "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08", "type": "github" }, "original": { diff --git a/profiles/base/default.nix b/profiles/base/default.nix index ab952cc..ec619ca 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -160,12 +160,27 @@ in userName = "Daniel Olsen"; aliases = { absorb = "!${pkgs.git-absorb}/bin/git-absorb"; + revise = "!${pkgs.git-revise}/bin/git-revise"; rc = "rebase --continue"; n = "!git commit --all --amend --no-edit && git rc"; }; extraConfig = { pull.rebase = true; - sequence.editor = "${pkgs.git-interactive-rebase-tool}/bin/interactive-rebase-tool"; + sequence.editor = let + girt = pkgs.unstable.git-interactive-rebase-tool.overrideAttrs (old: rec { + src = pkgs.fetchFromGitHub { + owner = "Dali99"; + repo = "git-interactive-rebase-tool"; + rev = "590f87d8ed16992373e214bca5994f89c69fa942"; + sha256 = "sha256-vUjqnt5ZSpzoohkzDXEqTMhMEkYzPMUZiaYWS0ZQcPQ="; + }; + cargoDeps = old.cargoDeps.overrideAttrs (oldB: { + name = "${oldB.name}"; + inherit src; + outputHash = "197dv8hbj4vd9grvhiinpsww3vfmmbl9b8gxk7la4gs8535s08x7"; + }); + }); + in "${girt}/bin/interactive-rebase-tool"; }; delta.enable = true; };