From 02bf8a261c4070493e8b17f6158e37707fe19376 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Wed, 26 Jan 2022 17:29:11 -0500
Subject: [PATCH] Firefox

---
 desktop.nix |  1 -
 flake.nix   | 28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index 81cca93..1c27e31 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -44,7 +44,6 @@
   };
   ## Left over uncategorized packages
   environment.systemPackages = with pkgs; [
-    firefox
     unstable.firefox-beta-bin
   ];
 }
diff --git a/flake.nix b/flake.nix
index be0c7d7..c8db0e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,20 @@
         ./modules/common.nix
         ./modules/ssh.nix
         ./applications/utils-core.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 = coreModules ++ [
         ./modules/audio.nix
@@ -56,20 +70,6 @@
         };
         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;
       };