From b854b66c08859422d4442d876c33c708f395808d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 25 Feb 2023 17:55:35 +0100
Subject: [PATCH] git: misc changes

- add some better push default configs
- remove a bunch of unused aliases
- remove `precomposeunicode = false` noop
- add `forcepush` alias
---
 home/programs/git.nix | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index 7ac5049..59449b4 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -23,30 +23,16 @@
 
     aliases = {
         aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'";
-        uncommit = "reset --soft HEAD^";
-        rev = "checkout HEAD -- ";
-        revall = "checkout .";
-        # unstage = "rm --cached ";
-        unstage = "restore --staged ";
         delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d";
-
-        mkbr = "checkout -b";
-        mvbr = "branch -m";
-        rmbr = "branch -d";
-        rrmbr = "push origin --delete";
-
         graph = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
         graphv = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all";
-        g = "!git graph";
+        forcepush = "push --force-with-lease --force-if-includes";
     };
 
     extraConfig = {
       core = {
         whitespace = "space-before-tab,-indent-with-non-tab,trailing-space";
-
-        precomposeunicode = false;
         untrackedCache = true;
-
         editor = "nvim";
       };
 
@@ -56,7 +42,12 @@
       init.defaultBranch = "main";
       fetch.prune = true;
       pull.rebase = true;
-      push.default = "current";
+
+      push = {
+        default = "current";
+        autoSetupRemote = true;
+        followTags = true;
+      };
 
       merge = {
         tool = "nvimdiff";