Modularize stuff better

2024-10-27 12:23:20 +01:00 · 2024-10-27 12:23:20 +01:00 · d427be6e4a
commit d427be6e4a
parent 5b92ddde89
20 changed files with 417 additions and 321 deletions
--- a/nixos/gnome.nix
+++ b/nixos/gnome.nix
@ -1,38 +1,49 @@
-{pkgs, ...}: {
-  services.xserver.desktopManager.gnome.enable = true;
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.pim.gnome;
+in {
+  options.pim.gnome.enable = lib.mkEnableOption "gnome";

-  environment = {
-    systemPackages =
-      [
-        pkgs.gnome.gnome-shell-extensions
-      ]
-      ++ (with pkgs.gnomeExtensions; [
-        pop-shell
-        window-is-ready-remover
-        random-wallpaper
-        workspaces-indicator-by-open-apps
-      ]);
+  config = lib.mkIf cfg.enable {
+    services.xserver.desktopManager.gnome.enable = true;

-    gnome.excludePackages =
-      (with pkgs; [
-        epiphany
-        gnome-connections
-        gnome-console
-        gnome-tour
-      ])
-      ++ (with pkgs.gnome; [
-        geary
-        gnome-calendar
-        gnome-clocks
-        gnome-contacts
-        gnome-font-viewer
-        gnome-logs
-        gnome-maps
-        gnome-music
-        seahorse
-        totem
-        yelp
-        gnome-weather
-      ]);
+    environment = {
+      systemPackages =
+        [
+          pkgs.gnome.gnome-shell-extensions
+        ]
+        ++ (with pkgs.gnomeExtensions; [
+          pop-shell
+          window-is-ready-remover
+          random-wallpaper
+          workspaces-indicator-by-open-apps
+        ]);
+
+      gnome.excludePackages =
+        (with pkgs; [
+          epiphany
+          gnome-connections
+          gnome-console
+          gnome-tour
+        ])
+        ++ (with pkgs.gnome; [
+          geary
+          gnome-calendar
+          gnome-clocks
+          gnome-contacts
+          gnome-font-viewer
+          gnome-logs
+          gnome-maps
+          gnome-music
+          seahorse
+          totem
+          yelp
+          gnome-weather
+        ]);
+    };
  };
 }