diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix
index 153ecd12034b4c7b1c07252f5d19fd1db4e2f019..fbcd56ee81da006ed4b575eee03c5e923743f8b1 100644
--- a/apps/nogui/nushell.nix
+++ b/apps/nogui/nushell.nix
@@ -11,7 +11,6 @@       df = "duf";
       du = "dust -b -d 1";
       ll = "ls -al";
       nix-shell = "nix-shell --run nu";
-      cachix-build = "cachix watch-exec jolheiser -- nix build --rebuild --max-jobs 4";
     };
     extraConfig = with pkgs; ''
       use ${nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *

diff --git a/flake.nix b/flake.nix
index a5e629ebc52b49b6164e7b60b6236a4fdfb9641f..cfdc2df349ac0ecac4c11759c875bc4f82755fce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,32 +35,31 @@       agenix,
       ...
     }@inputs:
     let
-      overlays = [
-        (_: prev: {
-          nur = import inputs.nur {
-            nurpkgs = prev;
-            pkgs = prev;
-          };
-          jolheiser = {
-            helix = inputs.helix.packages.${prev.system}.default;
-            gomodinit = inputs.gomodinit.packages.${prev.system}.default;
-            cfg = inputs.cfg.packages.${prev.system}.default;
-            spectre = inputs.spectre.packages.${prev.system}.default;
-            pokego = inputs.pokego.packages.${prev.system}.default;
-          };
-          tclip = inputs.tclip.packages.${prev.system}.tclip;
-          ghostty = inputs.ghostty.packages.${prev.system}.ghostty;
-        })
-      ];
+      overlay = _: prev: {
+        nur = import inputs.nur {
+          nurpkgs = prev;
+          pkgs = prev;
+        };
+        jolheiser = {
+          helix = inputs.helix.packages.${prev.system}.default;
+          gomodinit = inputs.gomodinit.packages.${prev.system}.default;
+          cfg = inputs.cfg.packages.${prev.system}.default;
+          spectre = inputs.spectre.packages.${prev.system}.default;
+          pokego = inputs.pokego.packages.${prev.system}.default;
+        };
+        tclip = inputs.tclip.packages.${prev.system}.tclip;
+        ghostty = inputs.ghostty.packages.${prev.system}.ghostty;
+      };
       pkgs = import inputs.nixpkgs {
-        inherit overlays system;
+        inherit system;
+        overlays = [ overlay ];
         config.allowUnfree = true;
       };
       commonConfig =
         { config, ... }:
         {
           config = {
-            nixpkgs.overlays = overlays;
+            nixpkgs.overlays = [ overlay ];
           };
         };
       username = "jolheiser";
@@ -101,6 +100,8 @@       ];
     in
     {
       inherit homeManagerModules;
+      overlays.jolheiser = overlay;
+      overlays.default = overlay;
       homeConfigurations = {
         "jolheiser" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
@@ -123,12 +124,6 @@             ./machines/sencha
             commonConfig
           ];
         };
-      };
-      nixConfig = {
-        extra-substitutors = [ "https://jolheiser.cachix.org" ];
-        extra-trusted-public-keys = [
-          "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="
-        ];
       };
       devShells.${system}.default = pkgs.mkShell {
         nativeBuildInputs = [

diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index b3e26a02e1334a3c0df8ac4bc4e3080ce9b7a89a..907b59f29e089434d6f24f1494ed9b0eeb4546c4 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -2,7 +2,6 @@ { pkgs, ... }:
 {
   imports = [ ../nogui ];
 
-  hardware.pulseaudio.enable = false;
   security = {
     rtkit.enable = true;
   };
@@ -12,6 +11,7 @@       enable = true;
       pulse.enable = true;
       alsa.enable = true;
     };
+    pulseaudio.enable = false;
     xserver = {
       enable = true;
       displayManager.lightdm.enable = true;

diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index 43c60e4bafec491ae59307a948612c5b51e1f52d..92f8db17c75a487261d7f4b3db45bc8874ae278b 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -46,7 +46,7 @@   nix = {
     gc = {
       automatic = true;
       randomizedDelaySec = "15m";
-      options = [ "--delete-older-than 14d" ];
+      options = "--delete-older-than 14d";
     };
     optimise.automatic = true;
     package = pkgs.nixVersions.stable;