From 53b8745b34890259097ebf84ced9cc3edda52941 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 6 Jul 2024 01:38:44 +0100
Subject: [PATCH] Update `git-instafix` to 0.2.7

v0.2.6 contained fixes for trunk-based development workflows that don't
require being on a separate branch.

https://github.com/quodlibetor/git-instafix/releases/tag/v0.2.6
---
 lib/shared/home-manager.nix | 5 ++++-
 lib/shared/modules/git.nix  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/shared/home-manager.nix b/lib/shared/home-manager.nix
index 6504d1c..75e862e 100644
--- a/lib/shared/home-manager.nix
+++ b/lib/shared/home-manager.nix
@@ -4,6 +4,9 @@
   username,
   self,
 }:
+let
+  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+in
 {
   home.username = "${username}";
   home.homeDirectory = "/home/${username}";
@@ -13,13 +16,13 @@
   programs.home-manager.enable = true;
 
   imports = [
+    (import ./modules/git.nix { inherit inputs pkgs pkgsUnstable; })
     (import ./modules/neovim.nix { inherit inputs; })
     ./modules/atuin.nix
     ./modules/bat.nix
     ./modules/bin.nix
     ./modules/direnv.nix
     ./modules/fzf.nix
-    ./modules/git.nix
     ./modules/lsd.nix
     ./modules/nnn.nix
     ./modules/phpactor.nix
diff --git a/lib/shared/modules/git.nix b/lib/shared/modules/git.nix
index 5f1b517..9e52255 100644
--- a/lib/shared/modules/git.nix
+++ b/lib/shared/modules/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, pkgsUnstable, ... }:
 
 {
   home.file.".gitmessage".text = ''
@@ -140,5 +140,5 @@
     };
   };
 
-  home.packages = with pkgs; [ git-instafix ];
+  home.packages = with pkgsUnstable; [ git-instafix ];
 }