flakes and shell tools

flake.lock

@@ -1337,11 +1337,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1741441089,
+        "lastModified": 1741454654,
-        "narHash": "sha256-kNSV7SX42VWZ2JZ4r6YGYc5Q4M6Lcjt0ugErgjh5qWo=",
+        "narHash": "sha256-IDFq4sq1q3ZOFk23L+0/ZQtwmV4Q/nmJ7/UoKKxsXSM=",
         "owner": "wez",
         "repo": "wezterm",
-        "rev": "18371a158c611cc044b29af40b3d8b6d6d273fdb",
+        "rev": "e8d84eeb539f10438b84c1cde67e9ec3f35b3e37",
         "type": "github"
       },
       "original": {

homes/emenel/default.nix

@@ -112,6 +112,19 @@
       extraConfig = {
         core = {
           editor = "$EDITOR";
+          pager = "${pkgs.delta}/bin/delta";
+        };
+        interactive = {
+          diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        };
+        delta = {
+          navigate = true;
+          dark = true;
+          line-numbers = true;
+          side-by-side = true;
+        };
+        merge = {
+          conflictstyle = "zdiff3";
         };
         init = {
           defaultBranch = "main";

modules/home/shell-conf.nix

@@ -3,6 +3,7 @@
 
   home.packages = with pkgs; [
 
+
     inputs.isd.packages.x86_64-linux.default
 
     cmake
@@ -106,6 +107,9 @@
 
     git-annex
     bfg-repo-cleaner
+    delta
+    tree
+    emoji-picker
 
     fishPlugins.foreign-env
     fishPlugins.fzf-fish
@@ -131,6 +135,7 @@
 
     faircamp
 
+
   ];
 
   programs = {