diff --git a/desktop.nix b/desktop.nix
index 3b008d1..81cca93 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -44,6 +44,7 @@
   };
   ## Left over uncategorized packages
   environment.systemPackages = with pkgs; [
-    firefox unstable.firefox-beta-bin
+    firefox
+    unstable.firefox-beta-bin
   ];
 }
diff --git a/flake.nix b/flake.nix
index 9312a6b..be0c7d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,23 @@
           };
           fenix = fenix.packages.x86_64-linux;
         };
-        modules = [ ./hardware/levitation.nix ] ++ desktopModules;
+        modules = [
+          ./hardware/levitation.nix
+          ({ pkgs, ... }: {
+            ## Setup binary caches
+            # First install cachix, so we can discover new ones
+            environment.systemPackages = [ pkgs.cachix ];
+            # Then configure up the nix community cache
+            nix = {
+              binaryCaches = [
+                "https://nix-community.cachix.org"
+              ];
+              binaryCachePublicKeys = [
+                "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+              ];
+            };
+          })
+        ] ++ desktopModules;
       };
 
       nixosConfigurations.x86vm = nixpkgs.lib.nixosSystem {
diff --git a/modules/user.nix b/modules/user.nix
index 45e7f1b..730f25d 100644
--- a/modules/user.nix
+++ b/modules/user.nix
@@ -33,8 +33,6 @@
 
   # Install general use packages
   environment.systemPackages = with pkgs; [
-    # cachix for nix cache management
-    cachix
     # Install our shell of choice
     unstable.fish
   ];