11 files changed, 36 insertions, 83 deletions
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 4ee4b7e..fd0aa54 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -4,7 +4,6 @@
       imports = [
         ../shared
         ./defaults
-        ./desktop
         ./mixins
         ./profiles
         ./services
diff --git a/modules/darwin/defaults/default.nix b/modules/darwin/defaults/default.nix
index 8068e2d..95884ff 100644
--- a/modules/darwin/defaults/default.nix
+++ b/modules/darwin/defaults/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./desktop-programs.nix
     ./programs.nix
   ];
 
diff --git a/modules/darwin/defaults/desktop-programs.nix b/modules/darwin/defaults/desktop-programs.nix
new file mode 100644
index 0000000..ee0f643
--- /dev/null
+++ b/modules/darwin/defaults/desktop-programs.nix
@@ -0,0 +1,10 @@
+{ config, lib, ... }:
+
+{
+  config = lib.mkIf config.homebrew.enable {
+    homebrew.casks = [
+      "chromium"
+      "iterm2"
+    ];
+  };
+}
diff --git a/modules/darwin/defaults/programs.nix b/modules/darwin/defaults/programs.nix
index 3f25ad8..48913c0 100644
--- a/modules/darwin/defaults/programs.nix
+++ b/modules/darwin/defaults/programs.nix
@@ -1,7 +1,11 @@
+{ pkgs, ... }:
+
 {
+  # NOTE: Not using the actual `programs.vim` module to avoid an annoying warning
+  environment.systemPackages = [ pkgs.vim ];
+
   programs = {
     bash.enable = true;
-    vim.enable = true;
     zsh.enable = true;
   };
 }
diff --git a/modules/darwin/desktop/default.nix b/modules/darwin/desktop/default.nix
deleted file mode 100644
index 878d13d..0000000
--- a/modules/darwin/desktop/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ lib, ... }:
-{
-  options.desktop = {
-    enable = lib.mkEnableOption "basic desktop settings";
-  };
-
-  imports = [
-    ./fonts.nix
-    ./homebrew.nix
-    ./programs.nix
-  ];
-}
diff --git a/modules/darwin/desktop/fonts.nix b/modules/darwin/desktop/fonts.nix
deleted file mode 100644
index b4d4ca3..0000000
--- a/modules/darwin/desktop/fonts.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.desktop.fonts;
-in
-{
-  options.desktop.fonts = {
-    enable = lib.mkEnableOption "desktop fonts" // {
-      default = config.desktop.enable;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    fonts.packages = [ pkgs.nerd-fonts.fira-code ];
-  };
-}
diff --git a/modules/darwin/desktop/homebrew.nix b/modules/darwin/desktop/homebrew.nix
deleted file mode 100644
index 93fe4ad..0000000
--- a/modules/darwin/desktop/homebrew.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.desktop.homebrew;
-in
-{
-  options.desktop.homebrew = {
-    enable = lib.mkEnableOption "Homebrew integration" // {
-      default = config.desktop.enable;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    homebrew = {
-      enable = true;
-
-      onActivation = lib.mkDefault {
-        autoUpdate = true;
-        cleanup = "zap";
-        upgrade = true;
-      };
-
-      caskArgs = {
-        no_quarantine = true;
-        require_sha = false;
-      };
-    };
-  };
-}
diff --git a/modules/darwin/desktop/programs.nix b/modules/darwin/desktop/programs.nix
deleted file mode 100644
index fd635da..0000000
--- a/modules/darwin/desktop/programs.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.desktop.defaultPrograms;
-in
-{
-  options.desktop.defaultPrograms = {
-    enable = lib.mkEnableOption "default desktop programs" // {
-      default = config.desktop.enable;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    homebrew.casks = [
-      "chromium"
-      "iterm2"
-    ];
-
-    programs.gnupg.agent.enable = lib.mkDefault true;
-  };
-}
diff --git a/modules/darwin/mixins/default.nix b/modules/darwin/mixins/default.nix
index 1e9a5a4..2723dd4 100644
--- a/modules/darwin/mixins/default.nix
+++ b/modules/darwin/mixins/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./home-manager.nix
+    ./homebrew.nix
   ];
 }
diff --git a/modules/darwin/mixins/homebrew.nix b/modules/darwin/mixins/homebrew.nix
new file mode 100644
index 0000000..1dea4cd
--- /dev/null
+++ b/modules/darwin/mixins/homebrew.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+
+{
+  config = {
+    homebrew = {
+      onActivation = lib.mkDefault {
+        autoUpdate = true;
+        cleanup = "zap";
+        upgrade = true;
+      };
+
+      caskArgs = {
+        no_quarantine = true;
+        require_sha = false;
+      };
+    };
+  };
+}
diff --git a/modules/darwin/profiles/personal.nix b/modules/darwin/profiles/personal.nix
index 6b1ec63..537e8ae 100644
--- a/modules/darwin/profiles/personal.nix
+++ b/modules/darwin/profiles/personal.nix
@@ -8,7 +8,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    desktop.enable = true;
+    homebrew.enable = true;
 
     traits = {
       users = {