From 857140bbd2b28cdd2e5dd0595cd625e6dc8983c1 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Fri, 26 Jul 2024 22:12:21 +0200
Subject: [PATCH] chore: switch to nixfmt

---
 config/services/pr-tracker.nix                  |   8 +++++---
 flake.nix                                       |   8 +++++---
 hosts/elisabeth/secrets/pr-tracker/env.age      | Bin 924 -> 897 bytes
 nix/devshell.nix                                |   9 +--------
 pkgs/pr-tracker.nix                             |   6 +++---
 .../common/programs/nvim/nixvim/plugins/lsp.nix |   4 ++--
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/config/services/pr-tracker.nix b/config/services/pr-tracker.nix
index 660e2a1..40cc06a 100644
--- a/config/services/pr-tracker.nix
+++ b/config/services/pr-tracker.nix
@@ -65,9 +65,11 @@ in {
       ExecStartPre = prestart;
       ExecStart = ''
         ${lib.getExe pkgs.pr-tracker} --url "https://pr-tracker.${config.secrets.secrets.global.domains.web}"\
-          --user-agent "Patricks pr-tracker"\
-          --path nixpkgs --remote origin\
-          --email-white-list ${config.age.secrets.prTrackerWhiteList.path}
+          --user-agent "Patricks pr-tracker" \
+          --path nixpkgs --remote origin \
+          --email-white-list ${config.age.secrets.prTrackerWhiteList.path} \
+          --email-address pr-tracker@${config.secrets.secrets.global.domains.mail_public} \
+          --email-server smtp.${config.secrets.secrets.global.domains.mail_public} \
       '';
       EnvironmentFile = config.age.secrets.prTrackerEnv.path;
 
diff --git a/flake.nix b/flake.nix
index 2339306..c62d541 100644
--- a/flake.nix
+++ b/flake.nix
@@ -196,13 +196,15 @@
         {
           src = lib.cleanSource ./.;
           hooks = {
-            alejandra.enable = true;
+            nixfmt = {
+              enable = true;
+              package = pkgs.nixfmt-rfc-style;
+            };
             deadnix.enable = true;
             statix.enable = true;
-            hunspell.enable = true;
           };
         };
       devShell = import ./nix/devshell.nix inputs system;
-      formatter = pkgs.alejandra;
+      formatter = pkgs.nixfmt-rfc-style;
     });
 }
diff --git a/hosts/elisabeth/secrets/pr-tracker/env.age b/hosts/elisabeth/secrets/pr-tracker/env.age
index bceaff96e8383ca50588314ca08c912755052861..09c29173872c35d0360b953fb9f5ed00f117d2b0 100644
GIT binary patch
literal 897
zcmY+<+pF7j0Kjnu4kREBbs{J%cti%Jw)wTWp=XjbNpoq^q-{<vZ%LY_m)x4>BxxN-
zUpx<rpbpUoQJA2<DB=y|;007fbh4MB!{PR#4+?G~jIkGQ;KTU`z8}6$;Me`w%hqW=
zOX7!;ENB!6R6hlq07VfJp5lVnS20UBTE<Y`nc+=P2}%o_TAsZ_Q9wgQY%^3urWruY
zP_maP#nb&NpQNU=TxzYjWP*&z(A6SCH>O*;4lojp{Z~k5MLh*52HRXP6H1s0ysoXR
zeOHPmUNuh!RWZR+GMYHO0mpfxV!j|Kb^#n@%0P6r1|2>^I0Gkqj_R<*gfnq}NCxZa
zz>sQymXZd(+O<^ckY$dvg-*c~K3=jLHR>ZpJgr$$r)Pv9<K%`41|(j!TXO6(tE#VK
zwgXj7;81HU&MLgpYYfNo!0n1g-(OW2p_{Tsq+%CHlox4-tpC6AgjVHJNhT7m(Rr6?
zv2$ag5WQM!M`#!13ilBnE6vR?8$&Kai~wTi3x|}~yr73xPK?PlPqiBg0(uUY8Pskg
z;~3RDWT8c*<{C`RdBqT&nLSr|MOb9cKnbRFEn4;3o?D>ZkdBbRG6Yd82avKEmm%A6
zJx5>aXfX=^NzB-Bsde$ec$719FE>+DM~KdUUysy-%y(8kybY<7rH^$~mK8<S8KoPN
z5GmFsckyC66pRr=$4$kuK^{wZb2yXr#CKIO3ROv}_4u_VL$;ZVR7<H5>2A>-CRRK~
z)CRv%<pJ+vR8>Z?;F#mN1b8lh>h(G-HcLlV!(d?1N=&2tgmvlhJfo{5DnnaoV>;<|
zML_iVCX`%}ifjCl;`SQ$=-$JBJ^jtA$*-@xNM1g-w{`Z|@oNWfFOL4E{d@pEe@wsd
zS@p@g>XDcKc>ev<@>j1#A3lEN>*vn?bo|ndd%n2st&8yTiOwZ(@2y*ZUi>uNI{D<u
z8$Sl8&OGq!g*)!L|N1`i%bizW;$FDiTfcMu;M_CU@7q7K-Bi9k9c({XY=3a<jk}AR
nABS(Ac<=YUA6|#Q|0o6C<Yu%u@zhcByQ{%1=l3Du%b5NfGy*(R

delta 872
zcmY+=-HY1<003}L8G{aSqLqmcX7l5v)}~3*TsOUuYkN(TG)dc}O@c2;n<mXin>K0F
zMx}~Oowpsw^kA@^AZ$}v*<i}tm@wQ888{|_+nDa-Wis#>w?htxoSW#If5Pwg?#6=~
z=YcBZxj2eYZ87b^^=3NTGZ9uYn>HGYHxVP-Y3Q)3#C1`$`H-OI4KOX%!7?Tn{EpB{
zVRYUMJf>g7;5LHFa=qAvC<0G{A2So-QBbZ7NeYpwj_wr56a=OkbtaO?nW~`bl}I^Y
zydl!nwZOMSi2=nY2JzIe)M7Qe9`VgW$5B1hBYdMLp{~M!0$-uLp_UItrvRtfk2(;N
z1O%>V@)&?QCf{qyR40I{L59;&CBbI$mHrT<pjtJhw!CS5pcuYHw9v^=7AzTriHOA*
zMb>j^R>^Y%M4K*CT(ailP{b-3wgsWtGT#0V;>Ja8P$UWkl1dF5R+9218fRsTr+mRg
ziDa%HNuWXC<pL=bw2c5Jp?0mz^^+0>C#`HowbgP*NKj59$r`1mkn0C6iT*zX>D#PV
z1TeT<)rW<+<CTbXD=VrrjE-=(YZue4oZrKA9*&`!Ml&j}qoEYd#JfVPiYP5!GZY>f
z;1aLfr8H@B+6>>Yam9}muo&0y|6Mbt<QXrjbye9_0ThVSa1Ey&fOSGvljsUo7ZQ8T
zX+1`gGAMI3kd<Sk2!=+{XcRzWeyU>4@KuXNB}Q|hCRxJ;FfoK>g$*VxrxYpB-FUo~
z%ZJcI&-{7shqY(DCq5mooO<J682{pidQwkZdgc5FZ`S{^Z{69ycgu~l<He;7`yRai
zd~Ms(dyh^Y`RTK%>sMb_=8wN~^~~nA?cCSbemxe>?A!Ur=#H~C_v+m0a>pbx_gwD)
z@$mQYp4%_{_T`yhyyCJQ@M(K?)9IB{*Pncvz7n3epe+eUZ%$lc!jFjVx0g3;{iuHU
z^Tmrh_PRS}=N~TY!X@gia~pr|?toc;4D%1;%jd>>E{zXeMh~oC+g3Wi-TwZom$Tyw
zM|LurpP5*H?dNj~mU3~+$~U9?CwA|D3E1lY{WeL*@b3oBbo(vz$NTQtPd3jzwfn^B
W&f^b+W$5T?@5R**7oAyb*TO%4rBI3h

diff --git a/nix/devshell.nix b/nix/devshell.nix
index 93e4db1..3973b53 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -1,7 +1,5 @@
 {
   self,
-  devshell,
-  agenix-rekey,
   ...
 }: system: let
   pkgs = self.pkgs.${system};
@@ -12,11 +10,6 @@ in
       # Nix
       nil
 
-      # Lua
-      stylua
-      (luajit.withPackages (p: with p; [luacheck]))
-      lua-language-server
-
       # Misc
       shellcheck
       pre-commit
@@ -35,7 +28,7 @@ in
         help = "Edit and rekey repository secrets";
       }
       {
-        package = pkgs.alejandra;
+        package = pkgs.nixfmt-rfc-style;
         help = "Format nix code";
       }
       {
diff --git a/pkgs/pr-tracker.nix b/pkgs/pr-tracker.nix
index fc84974..1639909 100644
--- a/pkgs/pr-tracker.nix
+++ b/pkgs/pr-tracker.nix
@@ -12,11 +12,11 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "patrickdag";
     repo = "pr-tracker";
-    rev = "71547ae3abbfd331a890ca2d5f3572bd92c0cecc";
-    hash = "sha256-Nq60EQz2TINtA4rkUsgVE4rvZ5O9otD8GXWJYPkiAhs=";
+    rev = "1be91285705bfdb55656db0835820cb034fe5010";
+    hash = "sha256-lPhp3Jq6YM8fi0WS/fJrCHdfdQFs5vdErdE5X80WAHE=";
   };
 
-  cargoHash = "sha256-pcIbL/mWhvQpQcVgyeNccW5cnHGKPKBpY9f2eeSrcjk=";
+  cargoHash = "sha256-9bhKtg2g5H4zGn7yVCjTazeXfeoKjtAKAlzkLkCraiw=";
 
   nativeBuildInputs = [pkg-config];
   buildInputs = [openssl systemd];
diff --git a/users/common/programs/nvim/nixvim/plugins/lsp.nix b/users/common/programs/nvim/nixvim/plugins/lsp.nix
index 71bcc05..b720ef7 100644
--- a/users/common/programs/nvim/nixvim/plugins/lsp.nix
+++ b/users/common/programs/nvim/nixvim/plugins/lsp.nix
@@ -16,7 +16,7 @@
           protolint.enable = true;
         };
         formatting = {
-          alejandra.enable = true;
+          nixfmt.enable = true;
           markdownlint.enable = true;
           shfmt.enable = true;
         };
@@ -57,7 +57,7 @@
         nil-ls = {
           enable = true;
           settings = {
-            formatting.command = [(lib.getExe pkgs.alejandra) "--quiet"];
+            formatting.command = [(lib.getExe pkgs.nixfmt-rfc-style) "--quiet"];
           };
         };
         nixd.enable = true;