1 files changed, 12 insertions, 12 deletions
diff --git a/modules/client/cinnamon/default.nix b/modules/cinnamon/default.nix
index b73cda5..c75cf0d 100644
--- a/modules/client/cinnamon/default.nix
+++ b/modules/cinnamon/default.nix
@@ -1,12 +1,14 @@
 { pkgs, lib, ... }:
 {
-  imports = [
-    ../xserver
-  ];
-
   services = {
-    xserver = {
+    ## Just in case this needs to be enabled 
+    # cinnamon.apps.enable = true;
+ 
+    gnome = {
+      gnome-keyring.enable = true;
+    };
 
+    xserver = {
       desktopManager.cinnamon = {
         enable = true;
       };
@@ -20,15 +22,13 @@
           enable = true;
         };
       };
-    };
 
-    ## Just in case this needs to be enabled 
-    # cinnamon.apps.enable = true;
+      wacom.enable = true;
 
-    gnome = {
-      gnome-keyring.enable = true;
-      # disable gNOME's "usecase?" ssh-agent
-      gcr-ssh-agent.enable = lib.mkForce false;
+      xkb = {
+        layout = "us, gr";
+        options = "grp:alt_shift_toggle";
+      };
     };
   };