modules/nixos+darwin: make everything an actual module again

1 files changed, 28 insertions, 21 deletions

diff --git a/modules/darwin/desktop.nix b/modules/darwin/desktop.nix
index 6dd7e65..c6eb106 100644
--- a/modules/darwin/desktop.nix
+++ b/modules/darwin/desktop.nix
@@ -1,32 +1,39 @@
 {
+  config,
   lib,
   pkgs,
   ...
-}: {
-  fonts.fonts = with pkgs;
-    lib.mkDefault [
-      (nerdfonts.override {fonts = ["FiraCode"];})
-    ];
+}: let
+  cfg = config.desktop;
+in {
+  options.desktop.enable = lib.mkEnableOption "base desktop settings";
 
-  homebrew = {
-    enable = lib.mkDefault true;
+  config = lib.mkIf cfg.enable {
+    fonts.fonts = with pkgs;
+      lib.mkDefault [
+        (nerdfonts.override {fonts = ["FiraCode"];})
+      ];
 
-    onActivation = lib.mkDefault {
-      autoUpdate = true;
-      cleanup = "zap";
-      upgrade = true;
-    };
+    homebrew = {
+      enable = lib.mkDefault true;
+
+      onActivation = lib.mkDefault {
+        autoUpdate = true;
+        cleanup = "zap";
+        upgrade = true;
+      };
 
-    caskArgs = {
-      no_quarantine = true;
-      require_sha = false;
+      caskArgs = {
+        no_quarantine = true;
+        require_sha = false;
+      };
+
+      casks = [
+        "chromium"
+        "iterm2"
+      ];
     };
 
-    casks = [
-      "chromium"
-      "iterm2"
-    ];
+    programs.gnupg.agent.enable = lib.mkDefault true;
   };
-
-  programs.gnupg.agent.enable = lib.mkDefault true;
 }