diff --git a/home-manager/default.nix b/home-manager/default.nix
index f5becdd..0413ae9 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -105,8 +105,6 @@ in
       pwgen
       magic-wormhole
 
-      nixpkgs-fmt
-
       # kubernetes stuff
       kubectl
       krew
diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index e2d03f4..82a85ef 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -5,7 +5,7 @@
     withPython3 = true;
     extraPackages = with pkgs; [
       nil
-      nixpkgs-fmt
+      nixfmt-rfc-style
       gopls
       pyright
       (python3.withPackages (ps: with ps; [
@@ -182,7 +182,7 @@
             ['nil'] = {
               testSetting = 42,
               formatting = {
-                command = { "nixpkgs-fmt" },
+                command = { "nixfmt-rfc-style" },
               },
             },
           },
diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix
index 8dae7b2..7c8562a 100644
--- a/home-manager/modules/zsh.nix
+++ b/home-manager/modules/zsh.nix
@@ -18,7 +18,6 @@
       "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.cccda.de buzzer";
       "beep" = "paplay /usr/share/sounds/freedesktop/stereo/complete.oga"; # play "ding" for long running jobs
       "dig" = "dig +short";
-      "cal" = "ncal -b";
     };
     initExtra = ''
       autoload -U colors && colors