From b1bfa2f6f9ef15536283a4dd867b5af2eed0fa0e Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@proton.me>
Date: Fri, 22 Sep 2023 21:16:24 +0200
Subject: [PATCH] chore: split default xserver configuration to desktop/default

---
 hosts/configuration.nix           |  1 +
 modules/desktop/default.nix       | 16 ++++++++++++++++
 modules/desktop/gnome/default.nix | 13 +------------
 3 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 modules/desktop/default.nix

diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index 0b73971..24862a8 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -15,6 +15,7 @@
 
 {
   imports =                                   # Home Manager Modules
+    [(import ../modules/desktop)] ++
     (import ../modules/services);
 
   hardware.pulseaudio.enable = false;
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..6cd1607
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services = {
+    xserver = {
+      enable = true;
+
+      layout = "us,cz";                              # Keyboard layout & €-sign
+      xkbVariant = ",qwerty";
+      xkbOptions = "eurosign:e";
+      libinput.enable = true;
+      modules = [ pkgs.xf86_input_wacom ];        # Both needed for wacom tablet usage
+      wacom.enable = true;
+    };
+  };
+}
diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix
index 5865957..e136043 100644
--- a/modules/desktop/gnome/default.nix
+++ b/modules/desktop/gnome/default.nix
@@ -15,18 +15,7 @@
   };
 
   services = {
-    xserver = {
-      enable = true;
-
-      layout = "us,cz";                              # Keyboard layout & €-sign
-      xkbVariant = ",qwerty";
-      xkbOptions = "eurosign:e";
-      libinput.enable = true;
-      modules = [ pkgs.xf86_input_wacom ];        # Both needed for wacom tablet usage
-      wacom.enable = true;
-
-      desktopManager.gnome.enable = true;         # Window Manager
-    };
+    xserver.desktopManager.gnome.enable = true;
     udev.packages = with pkgs; [
       gnome.gnome-settings-daemon
     ];
-- 
2.48.1