move machine configurations under darwin and nixos

Don't manage fonts on Darwin with homebrew.

5 files changed, 13 insertions, 9 deletions

diff --git a/nix/hosts/darwin/default.nix b/nix/hosts/darwin/default.nix
new file mode 100644
index 0000000..2da9dbc
--- /dev/null
+++ b/nix/hosts/darwin/default.nix
@@ -0,0 +1 @@
+{ ... }: { imports = [ ./homebrew.nix ./macos.nix ]; }
diff --git a/nix/hosts/common/homebrew.nix b/nix/hosts/darwin/homebrew.nix
index 1ba4a93..0840b06 100644
--- a/nix/hosts/common/homebrew.nix
+++ b/nix/hosts/darwin/homebrew.nix
@@ -19,7 +19,7 @@
       "kubebuilder"
     ];
 
-    taps = [ "homebrew/cask-fonts" "hashicorp/tap" ];
+    taps = [ "hashicorp/tap" ];
 
     casks = [
       "1password-cli"
@@ -31,13 +31,6 @@
       "vlc"
       "wireshark"
       "zoom"
-
-      # fonts
-      "font-go"
-      "font-source-code-pro"
-      "font-source-sans-3"
-      "font-source-serif-4"
-      "font-dejavu"
     ];
   };
 }
diff --git a/nix/hosts/common/macos.nix b/nix/hosts/darwin/macos.nix
index e764129..36f680a 100644
--- a/nix/hosts/common/macos.nix
+++ b/nix/hosts/darwin/macos.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ pkgs, ... }: {
   system.defaults.dock.autohide = true;
   system.defaults.dock.orientation = "left";
   system.defaults.dock.showhidden = false;
@@ -9,6 +9,16 @@
   system.defaults.screencapture.location = "~/Documents/screenshots";
   system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
 
+  fonts.packages = with pkgs; [
+    emacs-all-the-icons-fonts
+    google-fonts
+    roboto
+    source-code-pro
+    source-serif-pro
+    source-sans-pro
+    go-font
+  ];
+
   system.keyboard = {
     enableKeyMapping = true;
     remapCapsLockToControl = true;
diff --git a/nix/hosts/mba/default.nix b/nix/hosts/darwin/mba/default.nix
index 0a5caac..0a5caac 100644
--- a/nix/hosts/mba/default.nix
+++ b/nix/hosts/darwin/mba/default.nix
diff --git a/nix/hosts/work/default.nix b/nix/hosts/darwin/work/default.nix
index 9d5f2c0..9d5f2c0 100644
--- a/nix/hosts/work/default.nix
+++ b/nix/hosts/darwin/work/default.nix