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 bceaff9..09c2917 100644
Binary files a/hosts/elisabeth/secrets/pr-tracker/env.age and b/hosts/elisabeth/secrets/pr-tracker/env.age differ
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;