From 842e6575e1b08276a09a6b001f9816ef15e9557a Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Mon, 27 Nov 2023 19:24:42 +0100
Subject: [PATCH] git aliases

---
 home-manager/desktop.nix | 2 +-
 home-manager/git.nix     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index ec817ea..c2ee0ec 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -51,7 +51,7 @@ in
     '';
     shellAbbrs = {
       flamegraph = "perf script | inferno-collapse-perf | inferno-flamegraph > out.svg && firefox out.svg";
-
+      g = "git";
     };
     shellAliases = {
       x = "CARGO_MOMMYS_ACTUAL=${lib.getExe customPkgs.x} ${lib.getExe customPkgs.cargo-mommy}";
diff --git a/home-manager/git.nix b/home-manager/git.nix
index e88186b..44535a0 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -6,6 +6,13 @@
     userName = "Nilstrieb";
 
     aliases = {
+      # simple aliases
+      s = "status";
+      rc = "rebase --continue";
+      ra = "rebase --abort";
+
+      # complex renames
+      # TODO: use git-revise
       hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
       fpush = "push --force-with-lease";
       resq = "rebase --autosquash -i";