diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
index 1cb8776..c1fb08a 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/desktop/fonts.nix
@@ -1,5 +1,17 @@
+{ lib, ... }:
+let
+  appFontPackage = "fantasque-sans-mono";
+in
 {
-  flake.modules.nixos.desktop =
+  options.local = {
+    appFont = lib.mkOption {
+      type = lib.types.str;
+      readOnly = true;
+      default = "Fantasque Sans Mono";
+    };
+  };
+
+  config.flake.modules.nixos.desktop =
     { pkgs, ... }:
     {
       fonts.enableDefaultPackages = true;
@@ -11,11 +23,17 @@
         libertinus
         sarasa-gothic
         font-awesome
-        fantasque-sans-mono
+        pkgs."${appFontPackage}"
       ];
       fonts.fontconfig.defaultFonts = {
         monospace = [ "DejaVu Sans Mono" ];
         sansSerif = [ "DejaVu Sans" ];
       };
     };
+
+  config.flake.modules.hjem.macbook =
+    { pkgs, ... }:
+    {
+      packages = [ pkgs."${appFontPackage}" ];
+    };
 }
diff --git a/modules/flake/appearance.nix b/modules/flake/appearance.nix
deleted file mode 100644
index 2315d9a..0000000
--- a/modules/flake/appearance.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, ... }:
-{
-  options.local = {
-    appFont = lib.mkOption {
-      type = lib.types.str;
-      default = "Fantasque Sans Mono";
-    };
-    colors = lib.mkOption {
-      default = {
-        black = "#1C1B19";
-        brightBlack = "#918175";
-
-        red = "#EF2F27";
-        brightRed = "#F75341";
-
-        green = "#519F50";
-        brightGreen = "#98BC37";
-
-        yellow = "#FBB829";
-        brightYellow = "#FED06E";
-
-        blue = "#2C78BF";
-        brightBlue = "#68A8E4";
-
-        magenta = "#E02C6D";
-        brightMagenta = "#FF5C8F";
-
-        cyan = "#0AAEB3";
-        brightCyan = "#2BE4D0";
-
-        white = "#BAA67F";
-        brightWhite = "#FCE8C3";
-
-        orange = "#FF5F00";
-        brightOrange = "#FF8700";
-
-        xgray1 = "#262626";
-        xgray2 = "#303030";
-        xgray3 = "#3A3A3A";
-        xgray4 = "#444444";
-        xgray5 = "#4E4E4E";
-        xgray6 = "#585858";
-
-        hardBlack = "#121212";
-      };
-    };
-  };
-}
diff --git a/modules/flake/colors.nix b/modules/flake/colors.nix
new file mode 100644
index 0000000..b9ec88a
--- /dev/null
+++ b/modules/flake/colors.nix
@@ -0,0 +1,45 @@
+{ lib, ... }:
+{
+  # srcery
+  options.local.colors = lib.mkOption {
+    readOnly = true;
+    default = {
+      black = "#1C1B19";
+      brightBlack = "#918175";
+
+      red = "#EF2F27";
+      brightRed = "#F75341";
+
+      green = "#519F50";
+      brightGreen = "#98BC37";
+
+      yellow = "#FBB829";
+      brightYellow = "#FED06E";
+
+      blue = "#2C78BF";
+      brightBlue = "#68A8E4";
+
+      magenta = "#E02C6D";
+      brightMagenta = "#FF5C8F";
+
+      cyan = "#0AAEB3";
+      brightCyan = "#2BE4D0";
+
+      white = "#BAA67F";
+      brightWhite = "#FCE8C3";
+
+      orange = "#FF5F00";
+      brightOrange = "#FF8700";
+
+      xgray1 = "#262626";
+      xgray2 = "#303030";
+      xgray3 = "#3A3A3A";
+      xgray4 = "#444444";
+      xgray5 = "#4E4E4E";
+      xgray6 = "#585858";
+
+      hardBlack = "#121212";
+    };
+  };
+
+}
diff --git a/modules/hosts/macbook.nix b/modules/hosts/macbook.nix
index 707ad6d..dc6f397 100644
--- a/modules/hosts/macbook.nix
+++ b/modules/hosts/macbook.nix
@@ -25,8 +25,6 @@
 
       packages = with pkgs; [
         uutils-coreutils-noprefix
-        sarasa-gothic
-        fantasque-sans-mono
       ];
 
       xdg.config.files."git/config".value.user.email = "price@hubspot.com";