diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index cd7b7e6c..966b2bc2 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -1,24 +1,24 @@
-# name: Build and Deploy Manual
-# on:
-#   push:
-#     branches:
-#       - main
-# jobs:
-#   tests:
-#     runs-on: ubuntu-latest
-#     steps:
-#     - name: Checkout
-#       uses: actions/checkout@v3
-#     - name: Install Nix
-#       uses: cachix/install-nix-action@v20
-#     - name: Build manual
-#       run: |
-#         nix build '.#flake-manual' --show-trace  -vv -L
-#         mkdir docs
-#         curl https://nixos.org/favicon.ico -o docs/favicon.ico
-#         cp result/index.html  docs/index.html
-#     - name: Deploy 🚀
-#       uses: JamesIves/github-pages-deploy-action@4.1.0
-#       with:
-#         branch: gh-pages # The branch the action should deploy to.
-#         folder: docs # The folder the action should deploy.
+name: Build and Deploy Manual
+on:
+  push:
+    branches:
+      - main
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Install Nix
+      uses: cachix/install-nix-action@v20
+    - name: Build manual
+      run: |
+        nix build '.#manual' --show-trace  -vv -L
+        mkdir docs
+        curl https://nixos.org/favicon.ico -o docs/favicon.ico
+        cp result/index.html  docs/index.html
+    - name: Deploy 🚀
+      uses: JamesIves/github-pages-deploy-action@4.1.0
+      with:
+        branch: gh-pages # The branch the action should deploy to.
+        folder: docs # The folder the action should deploy.
diff --git a/flake.nix b/flake.nix
index 19e90415..5e89ca71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -168,10 +168,9 @@
             mqtt2prometheus
             smartmon-script
             woodpecker-pipeline
-            # manual
+            manual
             tfenv
             ;
-
         }
       );
 
diff --git a/modules/sound/default.nix b/modules/sound/default.nix
index ad44a7f1..76cc3464 100644
--- a/modules/sound/default.nix
+++ b/modules/sound/default.nix
@@ -15,8 +15,6 @@ in
   };
   config = mkIf cfg.enable {
 
-    # Enable sound.
-    sound.enable = true;
     environment.systemPackages = [ pkgs.qjackctl ];
 
     # Use pipeware to emulate jack and pulseaudio
diff --git a/overlays/default.nix b/overlays/default.nix
index 16b3860f..05065e61 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -10,10 +10,61 @@ in
 self: super: {
 
   # TODO: fix infinite recursion
-  # manual = super.callPackage ../packages/manual {
-  #   inherit inputs;
-  #   inherit flake-self;
-  # };
+  manual = super.callPackage ../packages/manual {
+    inherit inputs;
+    flake-self.nixosModules = with flake-self.nixosModules; {
+
+      # TODO:
+      # Some modules cause infinite recursion, so we only pass the ones that
+      # work. There is probably a better way, this should be automagic.
+
+      # caddy-security = flake-self.nixosModules.caddy-security;
+
+      inherit
+        activation-secrets
+        binary-cache
+        bluetooth
+        ci
+        default-desktop
+        default-server
+        dex
+        ente
+        environment
+        filebrowser
+        fonts
+        gitea
+        hedgedoc
+        hello
+        home-assistant
+        http2irc
+        kf-homepage
+        locale
+        lollypops-common
+        lvm-grub
+        mattermost
+        miniflux
+        minio
+        monitoring
+        networking
+        nextcloud
+        nix-common
+        ntfy-sh
+        openssh
+        owncast
+        restic
+        sound
+        thelounge
+        unbound-desktop
+        vikunja
+        virtualisation
+        wastebin
+        wireguard-client
+        xserver
+        yubikey
+        zsh
+        ;
+    };
+  };
 
   woodpecker-pipeline = super.callPackage ../packages/woodpecker-pipeline {
     inherit inputs;