3 files changed, 16 insertions, 2 deletions
diff --git a/modules/client/default.nix b/modules/client/default.nix
index f4216da..046f61f 100644
--- a/modules/client/default.nix
+++ b/modules/client/default.nix
@@ -2,9 +2,8 @@
   imports = [
     ./1password
     ./bluetooth
+    # ./cinnamon
     ./flatpak
     ./labwc
-    ./thunar
-    ./waybar
   ];
 }
diff --git a/modules/client/labwc/default.nix b/modules/client/labwc/default.nix
index 4344391..6512e7d 100644
--- a/modules/client/labwc/default.nix
+++ b/modules/client/labwc/default.nix
@@ -1,6 +1,12 @@
 { config, pkgs, ... }:
 # Set up a complete labwc instance system-side
 {
+  imports = [
+    ../thunar
+    ../waybar
+    ../xserver
+  ];
+  
   # Enable labwc
   programs.labwc.enable = true;
 
diff --git a/modules/client/xserver/default.nix b/modules/client/xserver/default.nix
new file mode 100644
index 0000000..7249ae2
--- /dev/null
+++ b/modules/client/xserver/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+# XServer
+{
+  services.xserver.xkb = {
+    layout = "us, gr";
+    options = "grp:alt_shift_toggle";
+  };
+}