diff --git a/helpers/gui/gnome.nix b/helpers/gui/gnome.nix deleted file mode 100644 index ab0eebf9b..000000000 --- a/helpers/gui/gnome.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, ... }: - -{ - # start gnome/gdm on boot - services.xserver.enable = true; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.displayManager.gdm.enable = true; - - # gnome does networking stuff with networkmanager - networking.useDHCP = false; - networking.networkmanager.enable = true; - networking.wireless.enable = lib.mkForce false; -} diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 812577604..48f4f41d6 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -2,6 +2,7 @@ { imports = [ + ./gnome.nix ./phosh.nix ./plasma-mobile.nix ./sway.nix diff --git a/modules/gui/gnome.nix b/modules/gui/gnome.nix new file mode 100644 index 000000000..38bd104ef --- /dev/null +++ b/modules/gui/gnome.nix @@ -0,0 +1,26 @@ +{ lib, config, ... }: + +with lib; +let + cfg = config.colinsane.gui.gnome; +in +{ + options = { + colinsane.gui.gnome.enable = mkOption { + default = false; + type = types.bool; + }; + }; + + config = mkIf cfg.enable { + # start gnome/gdm on boot + services.xserver.enable = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.displayManager.gdm.enable = true; + + # gnome does networking stuff with networkmanager + networking.useDHCP = false; + networking.networkmanager.enable = true; + networking.wireless.enable = lib.mkForce false; + }; +}