From 4d141b5b1ab129eda0ee2a7413fa69b77e72167a Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Mon, 24 Jun 2024 20:14:45 +0200
Subject: [PATCH] gnome

---
 devices/ellaca/options.nix |  2 +-
 modules/default.nix        |  4 ++--
 modules/gnome/default.nix  | 16 ++++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix
index a864d8f..a128744 100644
--- a/devices/ellaca/options.nix
+++ b/devices/ellaca/options.nix
@@ -5,7 +5,7 @@
   withBluetooth = true;
 
   withNiri = true;
-  withGnome = false;
+  withGnome = true;
   withPlasma = true;
 
   withVM = false;
diff --git a/modules/default.nix b/modules/default.nix
index aeb597e..c87701f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }: {
+{ inputs, pkgs, lib, ... }: {
   imports = [
     ./audio
     ./bluetooth
@@ -41,7 +41,7 @@
   documentation.nixos.enable = false;
 
   networking = {
-    useDHCP = true;
+    useDHCP = lib.mkDefault true;
     wireless.iwd.enable = true;
     extraHosts = 
     ''
diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix
index df73744..220769d 100644
--- a/modules/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -1,4 +1,16 @@
 { pkgs, lib, config, ... }: lib.mkIf (config.withGnome) {
-  services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
-  environment.systemPackages = [ pkgs.gnome.gnome-shell pkgs.gnome-randr ];
+  services.xserver = {
+    desktopManager.gnome.enable = true;
+  };
+
+  environment.gnome.excludePackages = (with pkgs.gnome; [
+    nixos-background-info
+    gnome-shell-extensions
+    pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
+    pkgs.gnome-user-docs
+    pkgs.orca
+    pkgs.gnome-menus
+  ]);
+
+  programs.dconf.enable = true;
 }