From 5a59f98ebccac2d604179a693d58fd7476df9d80 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Wed, 22 Oct 2025 08:19:52 -0400
Subject: [PATCH] working overlay to get latest version of lazygit

---
 flake.nix                   | 14 +++++++++++++-
 home/default.nix            |  1 +
 home/lazygit.nix            | 14 ++------------
 home/packages/common.nix    |  2 --
 modules/common/overlays.nix | 26 +++++++++++++++++++++++---
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 909e0e7..266aebb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,18 @@
       inherit userName userEmail ghostty;
     };
 
+    myOverlays = { ... }: {
+      nixpkgs.overlays = [
+        self.common.overlays
+      ];
+    };
   in {
-
     meta = import ./meta;
 
+    common = {
+      overlays = import ./modules/common/overlays.nix;
+    };
+
     # Primary laptop - MacBook Pro (2023, M3)
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
@@ -42,6 +50,7 @@
         role = "devel";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/sephiroth
 
@@ -64,6 +73,7 @@
         role = "devel";
       };
       modules = [
+        myOverlays
         nix-flatpak.nixosModules.nix-flatpak
         ./modules/common
         ./modules/machine/cloud
@@ -89,6 +99,7 @@
         role = "server";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/valefor
 
@@ -113,6 +124,7 @@
         role = "server";
       };
       # modules = [
+      #   myOverlays
       #   nix-flatpak.nixosModules.nix-flatpak
       #   nix-ld.nixosModules.nix-ld
       #   ./modules/nixos/hardware-configuration.nix
diff --git a/home/default.nix b/home/default.nix
index c463789..19219a2 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -27,6 +27,7 @@ in {
     ./browser.nix
     ./zellij.nix
     ./bat.nix
+    ./lazygit.nix
   ];
 
   # Home Manager needs a bit of information about you and the
diff --git a/home/lazygit.nix b/home/lazygit.nix
index 6ce2a73..2e7691e 100644
--- a/home/lazygit.nix
+++ b/home/lazygit.nix
@@ -1,17 +1,7 @@
-{ pkgs, ... }: let
-in {
+{ pkgs, ... }: {
   programs.lazygit = {
     enable = true;
-    package = pkgs.lazygit.overrideAttrs (oldAttrs: rec {
-      version = "0.55.1";
-
-      src = pkgs.fetchFromGitHub {
-        owner = "jesseduffield";
-        repo = "lazygit";
-        rev = "v${version}";
-        hash = pkgs.lib.fakeHash;
-      };
-    });
+    package = pkgs.lazygitLatest;
 
     settings = {
       gui.theme = {
diff --git a/home/packages/common.nix b/home/packages/common.nix
index 03034f2..b43311a 100644
--- a/home/packages/common.nix
+++ b/home/packages/common.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   ...
 }: {
@@ -14,7 +13,6 @@
 
     # utils
     tmux
-    lazygit
     bottom
     ripgrep
     jq
diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix
index c075c0f..855d91f 100644
--- a/modules/common/overlays.nix
+++ b/modules/common/overlays.nix
@@ -1,5 +1,25 @@
-{ pkgs, ... }: let 
-
-in {
+_: prev: {
+  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
+    version = "0.55.1";
+    src = prev.fetchFromGitHub {
+      owner = "jesseduffield";
+      repo = "lazygit";
+      rev = "v${version}";
+      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+    };
+  });
 
+  # atuin = prev.atuin.overrideAttrs (oldAttrs: rec {
+  #   version = "18.10.0";
+  #
+  #   src = prev.fetchFromGitHub {
+  #     owner = "atuinsh";
+  #     repo = "atuin";
+  #     rev = "v${version}";
+  #     hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
+  #   };
+  #
+  #   # cargoDeps = null;
+  #   cargoHash = prev.lib.fakeSha256;
+  # });
 }