From 9bd99e2794445e6a45540ffd7e3f576fbe8ffd39 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Tue, 20 Feb 2024 03:56:06 +0100
Subject: [PATCH] Add difftastic as git diff

---
 .config/aliasrc                 |  5 +----
 .config/environment             |  1 +
 .config/git/config              | 20 ++++++++++++--------
 .config/home-manager/common.nix |  2 ++
 .config/nix/nix.conf            |  3 +++
 5 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 .config/nix/nix.conf

diff --git a/.config/aliasrc b/.config/aliasrc
index 7088009..97410e8 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -34,8 +34,8 @@ alias grep='grep --color=auto'
 alias grep-highlight='grep -e "^" -e'
 
 alias hist-grep='history 0 | grep '
+alias http-server='python3 -m http.server'
 
-alias icat="kitty +kitten icat"
 alias ip='ip -c'
 
 alias j='jump'
@@ -50,8 +50,6 @@ alias make='make -j5'
 alias mkdir='mkdir -pv'
 alias mv='mv -iv'
 
-alias nixos-rebuild-tinker='sudo nixos-rebuild switch -p tinkering --no-build-nix'
-
 alias pacman-autoremove='sudo pacman -Rns $(pacman -Qtdq)'
 alias pacman-autoremove-opts='sudo pacman -Rns $(pacman -Qttdq)'
 alias ps-grep='ps aux | grep -v grep | grep'
@@ -60,7 +58,6 @@ alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_HOME/qutebrowser-kiosk -C $XDG
 
 alias rm='rm -I --one-file-system -v'
 
-alias sail='bash vendor/bin/sail'
 alias sl='ls'
 alias sudo='sudo '
 
diff --git a/.config/environment b/.config/environment
index 9041221..ccaf910 100644
--- a/.config/environment
+++ b/.config/environment
@@ -27,6 +27,7 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --no-overlap\
  -P '>' -p ''"
 
+export DFT_DISPLAY="side-by-side-show-both"
 export DMENU="bemenu"
 export DOCKER_BUILDKIT=1
 
diff --git a/.config/git/config b/.config/git/config
index f61077e..90174a3 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -5,15 +5,21 @@
 [core]
 	excludesfile = ~/.config/git/ignore
 	editor = vim
-	pager = less
 	autocrlf = input
 [help]
 	autocorrect = 20
+
 [diff]
-	tool = vimdiff
+	tool = difftastic
+	external = difft
 [difftool]
 	prompt = false
-	trustExitCode = true
+[difftool "difftastic"]
+	cmd = difft "$LOCAL" "$REMOTE"
+[pager]
+	difftool = true
+
+
 [alias]
 	b = branch -vv
 	ci = commit
@@ -28,12 +34,10 @@
 	lo = log --graph --decorate --oneline --all
 	s = status
 
+[log]
+	date = iso
 [merge]
-	tool = vim_mergetool
-	conflictstyle = diff3
-[mergetool "vim_mergetool"]
-	cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
-	trustExitCode = true
+	conflictstyle = zdiff3
 [sendemail]
 	smtpserver = mail.serguzim.me
 	smtpuser = tobias@msrg.cc
diff --git a/.config/home-manager/common.nix b/.config/home-manager/common.nix
index 973b48c..7e1731c 100644
--- a/.config/home-manager/common.nix
+++ b/.config/home-manager/common.nix
@@ -5,6 +5,8 @@
 	home.packages = with pkgs; [
 		asciinema # tool to record terminal sessions
 		bat # cat-alternative
+		cachix # tool to manage nix binary caches
+		difftastic # tool to compare files
 		direnv # tool to load custom environments
 		docker-credential-helpers
 		doggo # dns client
diff --git a/.config/nix/nix.conf b/.config/nix/nix.conf
new file mode 100644
index 0000000..7c827e3
--- /dev/null
+++ b/.config/nix/nix.conf
@@ -0,0 +1,3 @@
+experimental-features = nix-command flakes
+substituters = https://cache.nixos.org https://hyprland.cachix.org https://devenv.cachix.org
+trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc= devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=