use new gnome nix options 25.11

2 files changed, 15 insertions, 34 deletions

diff --git a/modules/desktop/gnome/dconf.nix b/modules/desktop/gnome/dconf.nix
index 382919a..580433d 100644
--- a/modules/desktop/gnome/dconf.nix
+++ b/modules/desktop/gnome/dconf.nix
@@ -1,24 +1,16 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.nx.desktop.gnome;
-
-  enabledExtensions = [
-    "pop-shell@system76.com"
-  ] ++ (if cfg.blur then [ "blur-my-shell@aunetx" ] else [ ]);
+{
+  config,
+  lib,
+  username,
+  ...
+}:
 
-in
 {
-  config = mkIf cfg.enable {
-    dconf.settings = {
+  config = lib.mkIf config.nx.desktop.gnome.enable {
+    home-manager.users."${username}".dconf.settings = {
       "org/gnome/desktop/interface" = {
         color-scheme = "prefer-dark";
       };
-      "org/gnome/shell" = {
-        enabled-extensions = enabledExtensions;
-      };
     };
   };
 }
diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix
index e192a83..40824a1 100644
--- a/modules/desktop/gnome/default.nix
+++ b/modules/desktop/gnome/default.nix
@@ -12,34 +12,23 @@
 
   options.nx.desktop.gnome = {
     enable = lib.mkEnableOption "Enable GNOME desktop environment";
-    blur = lib.mkEnableOption "Enable Blur my Shell";
   };
 
   config = lib.mkIf config.nx.desktop.gnome.enable {
+    services.displayManager.gdm.enable = true;
     services.desktopManager.gnome.enable = true;
+    services.gnome.core-developer-tools.enable = false;
+    services.gnome.games.enable = false;
 
-    environment.gnome.excludePackages = with pkgs.gnome; [
-      epiphany # web browser
-      geary # email client
-      gnome-calendar
-      gnome-characters
-      gnome-clocks
-      gnome-contacts
-      gnome-maps
-      gnome-music
-      gnome-photos
-      gnome-software
-      gnome-weather
+    environment.gnome.excludePackages = with pkgs; [
       gnome-tour
-      yelp
-      gnome-mines
-      gnome-sudoku
-      gnome-chess
+      gnome-user-docs
+      epiphany
     ];
 
     environment.systemPackages = with pkgs; [
       gnomeExtensions.pop-shell
-      (lib.optional cfg.blur pkgs.gnomeExtensions.blur-my-shell)
+      gnomeExtensions.blur-my-shell
       gnome-tweaks
     ];
   };