diff --git a/modules/desktop/graphics/default.nix b/modules/desktop/graphics/default.nix index 2811e055eb..669b893cdb 100644 --- a/modules/desktop/graphics/default.nix +++ b/modules/desktop/graphics/default.nix @@ -6,7 +6,6 @@ ./waybar.config.nix ./demo-apps.nix ./fonts.nix - ./gnome.nix ./window-manager.nix ./boot.nix ]; diff --git a/modules/desktop/graphics/gnome.nix b/modules/desktop/graphics/gnome.nix deleted file mode 100644 index 0d564aee61..0000000000 --- a/modules/desktop/graphics/gnome.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors -# SPDX-License-Identifier: Apache-2.0 -# -# GNOME Desktop support -# -{ - lib, - pkgs, - config, - ... -}: let - cfg = config.ghaf.graphics.gnome; -in { - options.ghaf.graphics.gnome = { - enable = lib.mkEnableOption "gnome"; - }; - - config = lib.mkIf cfg.enable { - hardware.opengl = { - enable = true; - driSupport = true; - }; - - environment.noXlibs = false; - - services.xserver.enable = true; - services.xserver.displayManager.gdm = { - enable = true; - wayland = true; - }; - services.xserver.desktopManager.gnome.enable = true; - - environment.gnome.excludePackages = with pkgs; [ - gnome-tour - epiphany - evolution - evolutionWithPlugins - evolution-data-server - gnome.geary - gnome.gnome-music - gnome.gnome-contacts - gnome.cheese - ]; - }; -} diff --git a/modules/desktop/profiles/graphics.nix b/modules/desktop/profiles/graphics.nix index 5d9cf45177..26e8502e76 100644 --- a/modules/desktop/profiles/graphics.nix +++ b/modules/desktop/profiles/graphics.nix @@ -7,7 +7,7 @@ ... }: let cfg = config.ghaf.profiles.graphics; - compositors = ["gnome" "labwc"]; + compositors = ["labwc"]; in with lib; { options.ghaf.profiles.graphics = { @@ -48,7 +48,6 @@ in }; config = mkIf cfg.enable { - ghaf.graphics.gnome.enable = cfg.compositor == "gnome"; ghaf.graphics.labwc.enable = cfg.compositor == "labwc"; }; }