From ef914553674b9538272308e96a731a8ddbb3e79b Mon Sep 17 00:00:00 2001 From: nicco Date: Fri, 27 Mar 2026 10:09:14 +0100 Subject: [PATCH] use difftastic --- cli/pkgs.nix | 2 +- common/home.nix | 2 +- files/git/gitconfig | 7 ++----- files/lazygit/config.yaml | 5 +++++ home/home.nix | 8 ++++++-- secrets/zed/settings.json | Bin 2360 -> 2385 bytes 6 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 files/lazygit/config.yaml diff --git a/cli/pkgs.nix b/cli/pkgs.nix index 1301cd0..7c3a73c 100644 --- a/cli/pkgs.nix +++ b/cli/pkgs.nix @@ -17,7 +17,6 @@ with pkgs; wget rsync yq - delta # Rust utils bat @@ -30,6 +29,7 @@ with pkgs; dust yazi starship + difftastic # Dev lazydocker diff --git a/common/home.nix b/common/home.nix index b494fef..3958e3d 100644 --- a/common/home.nix +++ b/common/home.nix @@ -22,7 +22,6 @@ wget rsync yq - delta kubectl croc asciinema_3 @@ -41,6 +40,7 @@ yazi starship ouch + difftastic # TUI lazydocker diff --git a/files/git/gitconfig b/files/git/gitconfig index 2303249..ed9c1a4 100644 --- a/files/git/gitconfig +++ b/files/git/gitconfig @@ -4,12 +4,9 @@ process = git-lfs filter-process required = true [core] - pager = delta excludesfile = ~/.gitignore_global autocrlf = input ignorecase=false -[interactive] - diffFilter = delta --color-only [pull] rebase = false @@ -31,5 +28,5 @@ [include] path = ~/.gitconfig.local -[delta] - navigate = true +[diff] + external = difft diff --git a/files/lazygit/config.yaml b/files/lazygit/config.yaml new file mode 100644 index 0000000..20b329a --- /dev/null +++ b/files/lazygit/config.yaml @@ -0,0 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/jesseduffield/lazygit/master/schema/config.json + +git: + pagers: + - externalDiffCommand: difft --color=always diff --git a/home/home.nix b/home/home.nix index 09fcd04..c3c8bc2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -33,8 +33,8 @@ let ".gitconfig".source = ../files/git/gitconfig; ".gitignore_global".source = ../files/git/gitignore_global; ".gitconfig.local".source = ../secrets/git/config.${host.hostName}; - ".config/nvim".source = ../files/nvim; - "Library/Application Support/lazydocker/config.yml".source = ../files/lazydocker/config.yml; + ".config/lazygit/config.yml".source = ../files/lazygit/config.yaml; + ".config/lazydocker/config.yml".source = ../files/lazydocker/config.yml; # Secrets ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] ( @@ -51,6 +51,10 @@ let vai = "sudo darwin-rebuild switch --flake ~/.config/dotfiles#${host.hostName}"; clean = "nix-collect-garbage -d"; }; + + sessionVariables = { + XDG_CONFIG_HOME = "$HOME/.config"; + }; }; }; diff --git a/secrets/zed/settings.json b/secrets/zed/settings.json index aac08da7498e0d3977ffb6bf018a2efcd4940b53..a1d2300dc76c7029e7aeb7bc151dd2477ce67d0e 100644 GIT binary patch literal 2385 zcmV-X39j}4M@dveQdv+`0O>i(r#GK9O-FwZFxzkN7;-B3a;-1*eX~KGUS>UGC=P)D zNc@WxCs=8Htu<;(oz6-3amOHYt$W@~C|~1R0Yy4V=xIX4w}7y;B0PE)vTE+ItJx>t82yOt3 z7=9y?6k>r&c72bbD@k!Nv5uV2-v!C=1-JZ-qj161>N3$JVjc&v`T{Os>8CwC5I8YyIQ`nS>GRonXpZDP`5Bkgnbz%~AY51?T!XPEcTcWCR=i7Fm4+KZ27)}QVn#@X4n5>nA3n2Vz+~NaGWM1B49!MP8KS1 z<$*@cM$ppjl_OH4MolQ+xWx3Sa^gH+yuXuISpyu=Pw$G82XsPex)KERNj$Fp9dcaU zPYwa&2(>r`)f-*o(rPnV9yf3I=Qn!I{r(xxB0)=uF)_0#*zJ!zmS>?GaPTOWN#!Q4 zL>agr)wOZ7!OG>xF@zv9b-A&On-ySrT6Old0TEhj2#_SEb|B zu#n9XBh)4l4IqLPiQ7d`1Cskc6$Yopm7!%DEBfL_c=!KUyZliWh0WG?p1EWV#Xn2| zPa+-W`nJk!j>i#oqMA6tEve)f?_sB#e(F$4>+WvIflrT3Uu)g(ot|~O>(1*Ck1nre zx9!+LRlFo3B1e?DIB>wBP9!DHN`6jUz`aj#4F&{!{}1DzxFIP;FSo_h|N5c}6svR}tR%&cOx z1Qrkoj64W~OY!1)5bVQmH_fV0wPO_&#HQA2SDb`&TuRx?Kv7~fJEq(dP#IOP8d8%O zi{~iwNE{_X7&mmKy*3FYd%3cG@4G=oEVPZPwMl5X=XZ?T3*8Xu92>eXM;4AS7#v>ckH^x~bHpCGV+oFM>&PJvCsN$z0t z&0^Q+C2nFXXX1=jsq&g?dq37>KD;|-J4hu zHNEJNaSm^vELdLCT--^nFWwhcq!=KTz`{=^*J25pmxj%@&1Q+JnEfH%sI#sjct8HR zior=dMPc{fON1G)<+4H0lv|!|ELLqfY$^UVX_oqJv+rN&9~cM`P)|o-((}%@cNTi; z)YuF=Ru|U0d^7B6r{G3^Xe~|SH*V2hetiO})lLWU3AY$1dnFE=lyBLxv|L8BK4kS= z=Mu*Z%hhf3+5#ps%#&=)y@8CS*9%b>8wbl{Y%fdDw#WBlb;nD_(`B})X;6;$&tddq zt*6J8R1jEa0k=DA3H`HQ^78vs2BEj1JB)zefUWh`vV8H5=~Z(sGHqTR^+qVFYlFef zK{k!}C``=~1&NmBSZkGG3lG1llDC^M#bptYH{eBA3m-XnVV=L#f_Hj7P0*Z8x2DnYtz!Bz`he}aJPip2*(|^As2Af#5tW^uLPx~tE z!{~#oQWX3N)+w{$9vxmN#W8uHlZ@`!^1lJGb9h>huI-Kr8=0q3N`>)*YF~`My$o9? z(3ZQB7u^C87flFazWx@O!b7Q%jC>*7Zy+Gs)1+6_wpdUD&{LfEBoz?xmf^KjU(B@ z(%Fe}HEC0**c!0X(I&C9HctEM3}5>F3}wmQKa3um$2CKY4yFIOn>p7ZbS>q)4@j-_ zPe8X}{p=?IZxB8Z%n68N_6e+bC74>L7hmkjNKW{0D~Q$L#q&=|MxE>Z88gXUN?572 z^%g&ZFMXkU0w0{q32x1M$v~ySP)<|gpS}u_dyQSRZ~O{87g{ktS0{DM^6jmihOhN1 z#5vu#W2e-XqK5c4;L&vAXJ z*n=*m^`s(U!>Pp;I~1A2K^>y$JhIVNCe3k6k!)P7F&lKxCTxSjVPa6>D*nq(q|U9} zKPFw%P?-^t|6lr-F_SH_b))V9(>KI6uW5M027;xUG&(m6Ozyo#=Ar_%x^cI1I&Wf{ DFtw6) literal 2360 zcmV-83CH#TM@dveQdv+`0A?l3gEydAuzIb(7Kvk~ig$y25^PVl)eNO!AEA?isx_K)pBbRldKNPD>M9I7-1JWQDE>b*nq!e0~vPk#!(ih zQ14^HA7GMWfLVZ?Yf7~>>g_My5_2*1O8@O8?3$>}hqygAj2Jcr;I>*YyFy5q=j1Or z9f<2g@_3sdc#w$e=vz-|h)R5e!=4WPH%_>VY?_EEQ-NQu znN;!A)aO40*U&vPre5sm>vz8Iq%UQr4Wdvsl!PsV(IQ16&1x|tfmmtceZgS5iSjd9 zklj5Fq8|j{oLNXM5b`G_osCH~7Jkydjbn)P#@^UlvYbp@5b6>cPf#bxonC+?fc! zcV*A*kFYm%fW~b+DevVB$M=__Uy_28;RUR4Mbu`E8m-+1h}Fh~n4>iTPmn`|>iw7RoLW=R#{Cy?jhU??++jlgc%No9 zB^*~OhMy?x{=B?`|0z1@uR96QfXQFYY*0kX;U(#J2Q(o65z)fBa1bxzx}7E9Nf-2ayB$H*I$Y_^{7=@tjj-+ftZpX)8_nFAsV0W{gnTbw zrz~heR9ivSd=9KaLzcDp7}ByJMXaohgzvLIW23r6Qdg5bJ1f@c=I#N6^?+FWO}{$U zF#{9mZ?c%EcL*~*nMn10i>~BS#A|=xGcx@<5l8$533b%QZhI~m)wFBw1wkme zvm1Eg;z5ci6HSFuXl()^yA2lPXh3L}sGZJ693mb5Z`8P5GsTd4Miavk)eqt*sU$tK zRnxsg zx%B4RLMsJ6gf3A-AdWX<3%us|Z27F=Z#v+B)^0IjN+%a88v|rod=M=Jv9&F0**gQ)%KhKDS)WaHOB@>mGSNt@cL1lWp_U;h-*tvFIkFj2=Xl;Z=KY_v;A34T4 z3j$UdRb8Ah#9K8pbw=3g7ZtV3ktKbzs=LLBk; zI4WOpPK5CsLxJfl)(s0KY4-NnxPI*sLLUc_^hGA^uxg?Dm@b^J_~(|uM3%}<2RCZ@ z5dhxoUqoP1%x_HZGIg(DT;pQ%J(5@F2oz=-f{eYL<8ylhPYm)8h7kmXjqn7g<2prU zzdN_IhA%lpp8eR_uYg@XEBZTTr!3=q(tsu<-3dCvC=4$H#;%gA07s10aslKP2?qr< zE$;KJU(NPJi@FL_H7wRPn;gz1;I5Lx({AVGxvYR9yg@G;Y4ty7FfJEZ3o9o*0P=oF z7QokbCSX{nsMp)*yT51Q@^16&PKKw|u2*3zju$idJF9(#O1aLvg2AIpcs81CDO^$# zTKoc_$>owE)30~5KiZQ$im-8U1}B9GiD8=+MuRKCrS}*^b<;gc-rp-Q|B6rno4=bk z!4XiFnSN~s=c5znVD8mf0-1=pan)v3GNYs(=o;wRv0;cRafbC(DmW9Q?0yX{xubm~ zKI|TDC!b|cE!XMHNN?mu@48TB*_Jf#5f;MjmJ*&C!b6Iwx2msMsW$#0E(Qk^8;29c zm#Qs#*+Q9jg-qtt+m4W(5>zZ79fn;)`)XyFNL5-FZ9SWdUNZXZ2V$v>(A*Cb`tlL& zA>$=`p#ZPFahu zClT7C`P@l`HBtZ;02||BYoNICa2kU@G67q3KYsuN6@+T>!$eSCcydla#CJ8aK|Q$9 z0`N6@puaJmAY%uZL4AW(d2|)S*kJbrxZJk^zXRjS7c>ECcpbB|60QL7k=y$i)cjRV z&S8kBYEK#!+J5o-SHl&ZR(TW9y1L68c#h7^{!_rWh%|fB0+`Mr63X6Vf%CP7d0X9d z{l&uuNxMX1un5B~k8e_~f?#r;sQ^t{?F>V15EuRNViSTq>a%}$Lv76e3@&xz?tSAc zt~%o>Zimmyc@2%lk#?~dc{;58Xzjgu#45C@9=^MT?-iLRQt%DGceM`LUe#23yAZu< eN=gxqO04-i+tslS=}!?igrM1EjC-BX^p6no+=n^<