diff --git a/hosts/niuniobook.nix b/hosts/niuniobook.nix
index d912a2d..40b7b51 100644
--- a/hosts/niuniobook.nix
+++ b/hosts/niuniobook.nix
@@ -20,7 +20,10 @@
       ./modules/builders.nix
       {
         system.stateVersion = 5;
-        documentation.enable = true;
+        documentation = {
+          enable = true;
+          man.enable = true;
+        };
       }
       inputs.home-manager.darwinModules.home-manager
       {
diff --git a/hosts/supadupa.nix b/hosts/supadupa.nix
deleted file mode 100644
index 4990358..0000000
--- a/hosts/supadupa.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ inputs, ... }:
-{
-  type = "darwin";
-
-  hostname = "Supadupa";
-
-  system = inputs.darwin.lib.darwinSystem {
-    system = "aarch64-darwin";
-    modules = [
-      {
-        # You should generally set this to the total number of logical cores in your system.
-        # $ sysctl -n hw.ncpu
-        nix.settings.max-jobs = 8;
-        nix.settings.cores = 8;
-      }
-      ../modules/common.nix
-      ../modules/darwin.nix
-      ../modules/fonts.nix
-      ./modules/environment.nix
-      # ./modules/builders.nix
-      ../modules/nvim.nix
-      {
-        system.stateVersion = 4;
-        documentation.enable = true;
-      }
-      inputs.lix-module.nixosModules.default
-      inputs.home-manager.darwinModules.home-manager
-    ];
-
-    inherit inputs;
-  };
-}
diff --git a/modules/common.nix b/modules/common.nix
index 12386de..aa8671a 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -14,6 +14,7 @@
   ];
 
   nix.registry = {
+    nixpkgs.flake = inputs.nixpkgs;
     dotfiles.flake = inputs.self;
     flake-parts.flake = inputs.flake-parts;
   };
diff --git a/modules/email.nix b/modules/email.nix
index 6a1edb5..501b4cd 100644
--- a/modules/email.nix
+++ b/modules/email.nix
@@ -8,7 +8,7 @@
   targets.darwin.defaults = {
     # Remember the fallen
     "com.apple.mail" = {
-      UserHeaders = "{ \"X-Clacks-Overhead\" = \"GNU Terry Pratchett\"; }";
+      # UserHeaders = "{ \"X-Clacks-Overhead\" = \"GNU Terry Pratchett\"; }";
     };
   };
 
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 30c8ca9..c44b992 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -10,7 +10,6 @@ in
   fonts = {
     packages = [
       pkgs.lato
-      pkgs.pixel-code
       pkgs-self.hosevka
     ];
   };
diff --git a/modules/nvim.nix b/modules/nvim.nix
index b823aa3..0a3a8ad 100644
--- a/modules/nvim.nix
+++ b/modules/nvim.nix
@@ -12,7 +12,7 @@ let
       # runtimepath editing is not yet perfect, but works good enough so far
       customRC =
         let
-          expert = inputs.expert.packages.${pkgs.stdenv.hostPlatform.system}.expert;
+          expert = pkgs.beamMinimal29Packages.expert;
         in
         ''
           set runtimepath+=${./nvim}/after