From c54c586fbae777316c5ada48c0790c5107050fc8 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Thu, 28 Aug 2025 00:26:10 +0530
Subject: [PATCH] Revert "tart: darwin common"

This reverts commit 6ae99761e8f31c0c88d97db194a22e95e1bc64b2.
---
 configurations/home/srid@infinitude.nix | 7 ++++++-
 modules/home/all/terminal.nix           | 1 +
 modules/home/darwin-only.nix            | 4 ----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configurations/home/srid@infinitude.nix b/configurations/home/srid@infinitude.nix
index 3058eb5..17f6648 100644
--- a/configurations/home/srid@infinitude.nix
+++ b/configurations/home/srid@infinitude.nix
@@ -1,4 +1,4 @@
-{ flake, ... }:
+{ lib, pkgs, flake, ... }:
 let
   inherit (flake) inputs;
   inherit (inputs) self;
@@ -10,4 +10,9 @@ in
   ];
 
   home.username = "srid";
+
+  home.packages = [
+  ] ++ lib.optionals pkgs.stdenv.isDarwin [
+    pkgs.tart
+  ];
 }
diff --git a/modules/home/all/terminal.nix b/modules/home/all/terminal.nix
index 6659bee..0dfcb59 100644
--- a/modules/home/all/terminal.nix
+++ b/modules/home/all/terminal.nix
@@ -47,6 +47,7 @@ in
     fuckport
     sshuttle-via
     entr
+    git-merge-and-delete
 
     # Fonts
     cascadia-code
diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix
index 579ac44..d03c22d 100644
--- a/modules/home/darwin-only.nix
+++ b/modules/home/darwin-only.nix
@@ -6,8 +6,4 @@
     ./all/nushell
     # ./all/emacs.nix
   ];
-
-  home.packages = [
-    pkgs.tart
-  ];
 }