From ea67ceb4f45e356b548460cb7c21fe5f420c62e5 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 16 Aug 2024 17:49:21 -0400
Subject: [PATCH] add new program

---
 home/terminal.nix                 |  1 +
 packages/git-merge-and-delete.nix | 77 +++++++++++++++++++++++++++++++
 packages/overlay.nix              |  1 +
 3 files changed, 79 insertions(+)
 create mode 100644 packages/git-merge-and-delete.nix

diff --git a/home/terminal.nix b/home/terminal.nix
index 2d208ac..764cd51 100644
--- a/home/terminal.nix
+++ b/home/terminal.nix
@@ -28,6 +28,7 @@
     fuckport
     sshuttle-via
     entr
+    git-merge-and-delete
 
     # Fonts
     cascadia-code
diff --git a/packages/git-merge-and-delete.nix b/packages/git-merge-and-delete.nix
new file mode 100644
index 0000000..5771e0d
--- /dev/null
+++ b/packages/git-merge-and-delete.nix
@@ -0,0 +1,77 @@
+{ writeShellApplication, git, ... }:
+
+writeShellApplication {
+  name = "git-merge-and-delete";
+  meta.description = ''
+    Merge the given branch to `main`, push and clean everything up.
+  '';
+  runtimeInputs = [ git ];
+  text = ''
+    # Set some fancy colors
+    RED='\033[0;31m'
+    # GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    BLUE='\033[0;34m'
+    NC='\033[0m' # No Color
+
+    # Function to print colorful messages
+    print_message() {
+        >&2 echo -e "''${YELLOW}🚀 $1''${NC}"
+    }
+
+    # Function to print and execute git commands
+    git_command() {
+        >&2 echo -e "''${BLUE}> git $*''${NC}"
+        git "$@"
+    }
+
+    # Check if branch name is provided
+    if [ $# -eq 0 ]; then
+        echo -e "''${RED}❌ Error: No branch name provided. Usage: $0 <branch_name>''${NC}"
+        exit 1
+    fi
+
+    BRANCH_NAME=$1
+
+    # Check if we're on the correct branch
+    current_branch=$(git_command rev-parse --abbrev-ref HEAD)
+    if [ "$current_branch" != "$BRANCH_NAME" ]; then
+        echo -e "''${RED}❌ Oops! You're not on the '$BRANCH_NAME' branch. Aborting mission!''${NC}"
+        exit 1
+    fi
+
+    # Check for dirty changes
+    if ! git_command diff-index --quiet HEAD --; then
+        echo -e "''${RED}❌ Houston, we have a problem! There are uncommitted changes. Commit or stash them first.''${NC}"
+        exit 1
+    fi
+
+    print_message "All systems go! Preparing for merge..."
+
+    # Switch to main branch
+    git_command checkout main
+
+    # Merge the specified branch into main
+    if git_command merge "$BRANCH_NAME"; then
+        print_message "Merge successful! Ready for liftoff..."
+    else
+        echo -e "''${RED}❌ Merge conflict detected! Abort! Abort!''${NC}"
+        exit 1
+    fi
+
+    # Push changes to remote
+    print_message "Pushing changes to the mothership..."
+    git_command push origin main
+
+    # Delete the specified branch locally and remotely
+    print_message "Time to clean up our space debris..."
+    git_command branch -d "$BRANCH_NAME"
+    git_command push origin --delete "$BRANCH_NAME"
+
+    # Run git status
+    print_message "And now, the final systems check..."
+    git_command status
+
+    print_message "Mission accomplished! You're clear for your next adventure, Space Cowboy! 🌠"
+  '';
+}
diff --git a/packages/overlay.nix b/packages/overlay.nix
index 30e75ff..d1677af 100644
--- a/packages/overlay.nix
+++ b/packages/overlay.nix
@@ -10,4 +10,5 @@ self: super: {
   # nix-health = flake.inputs.nix-browser.packages.${system}.nix-health;
   actualism-app = flake.inputs.actualism-app.packages.${system}.default;
   omnix = flake.inputs.omnix.packages.${system}.default;
+  git-merge-and-delete = self.callPackage ./git-merge-and-delete.nix { };
 }