From dee2a92cf194402530e52b9ae0d165abe75fda97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20D=C3=B6nszelmann?= <jonathan@donsz.nl>
Date: Sat, 2 Nov 2024 12:22:32 +0100
Subject: [PATCH] update before update

---
 programs/git/default.nix | 8 +++++++-
 programs/nvim/config.lua | 1 -
 programs/zsh/default.nix | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/programs/git/default.nix b/programs/git/default.nix
index 71c9077..3031401 100644
--- a/programs/git/default.nix
+++ b/programs/git/default.nix
@@ -10,6 +10,11 @@ _: {
     delta.options = {
       navigate = true;
       light = false;
+      side-by-side = true;
+      features = "decorations interactive";
+      interactive = {
+        keep-plus-minus-markers = false;
+      };
     };
 
     extraConfig = {
@@ -17,9 +22,10 @@ _: {
       pull.rebase = true;
       init.defaultBranch = "main";
       gpg.format = "ssh";
-      diff.colorMoved = true;
+      diff.colorMoved = "default";
       rerere.enabled = true;
 
+      alias.conflicts = "diff --check";
     };
   };
 }
diff --git a/programs/nvim/config.lua b/programs/nvim/config.lua
index 3d8bef2..9d749c7 100644
--- a/programs/nvim/config.lua
+++ b/programs/nvim/config.lua
@@ -96,7 +96,6 @@ vim.keymap.set("v", "<S-Tab>", "<gv")
 
 vim.keymap.set('n', 'gr', builtin.lsp_references, {})
 vim.keymap.set('n', 'gd', builtin.lsp_definitions, {})
-vim.keymap.set('n', 'gi', builtin.lsp_implementations, {})
 vim.keymap.set('n', 'gt', builtin.lsp_type_definitions, {})
 
 -- format on wq and x and replace X, W and Q with x, w and q
diff --git a/programs/zsh/default.nix b/programs/zsh/default.nix
index 3967b25..f1e9d97 100644
--- a/programs/zsh/default.nix
+++ b/programs/zsh/default.nix
@@ -12,7 +12,7 @@ let
     "ll" = "${pkgs.eza}/bin/eza --git";
     "lt" = "${pkgs.eza}/bin/eza --long --tree -L 3";
     "open" = "${pkgs.xdg-utils}/bin/xdg-open";
-    "clip" = "${pkgs.wl-clipboard-rs}/wl-copy";
+    "cb" = "${pkgs.wl-clipboard-rs}/wl-copy";
 
     "pull" = "${pkgs.git}/bin/git pull";
     "push" = "${pkgs.git}/bin/git push";
@@ -21,6 +21,10 @@ let
     "patch" = "${pkgs.git}/bin/git add -p";
     "amend" = "${pkgs.git}/bin/git commit --amend";
     "log" = "${pkgs.git}/bin/git log --all --graph --decorate";
+    "status" = "${pkgs.git}/bin/git status";
+    "checkout" = "${pkgs.git}/bin/git checkout";
+    "rebase" = "${pkgs.git}/bin/git rebase";
+    "stash" = "${pkgs.git}/bin/git stash";
   };
   # extracting any compressed format
   extract = ''