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

1 files changed, 27 insertions, 16 deletions

diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index 18f023f..a925199 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -1,21 +1,32 @@
-{pkgs, ...}: {
-  environment = {
-    gnome.excludePackages = with pkgs; [
-      gnome-tour
-    ];
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.desktop.gnome;
+in {
+  options.desktop.gnome.enable = lib.mkEnableOption "GNOME desktop";
 
-    sessionVariables = {
-      NIXOS_OZONE_WL = "1";
-    };
+  config = lib.mkIf cfg.enable {
+    environment = {
+      gnome.excludePackages = with pkgs; [
+        gnome-tour
+      ];
 
-    systemPackages = with pkgs; [
-      adw-gtk3
-      blackbox-terminal
-    ];
-  };
+      sessionVariables = {
+        NIXOS_OZONE_WL = "1";
+      };
 
-  services.xserver = {
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
+      systemPackages = with pkgs; [
+        adw-gtk3
+        blackbox-terminal
+      ];
+    };
+
+    services.xserver = {
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+    };
   };
 }