diff --git a/configuration.nix b/configuration.nix
index 259e520..8836627 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,6 +14,27 @@
 
   powerManagement.enable = true;
 
+  services.xserver = {
+    enable = true;
+    windowManager.i3.enable = true;
+    layout = "de";
+
+    libinput = {
+      enable = true;
+      touchpad = {
+        horizontalScrolling = false;
+	naturalScrolling = true;
+      };
+    };
+
+    displayManager = {
+      defaultSession = "none+i3";
+      autoLogin = {
+        enable = true;
+	user = "mandlm";
+      };
+    };
+  };
 
   time.timeZone = "Europe/Berlin";
   services.timesyncd.enable = true;
diff --git a/users.nix b/users.nix
index 881d804..13b3b85 100644
--- a/users.nix
+++ b/users.nix
@@ -9,7 +9,7 @@
       uid = 1000;
       home = "/home/mandlm";
       shell= pkgs.zsh;
-      extraGroups = [ "wheel" "networkmanager" ];
+      extraGroups = [ "wheel" "audio" "video" "input" ];
       hashedPassword = "$6$wV6dzYlgke5tN01q$rCMP/Hquss/1BgKarnZUkmejpBtjEcwmlUhbhAAmjc2Pwdbztp3yr/bD/LJ63XoZ0oD7yhTMqbECDdMqNKKDe/";
       openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI6NmrDRvDtUkeJM8cE7DvZKtiNBKUQ+30MhOX4BwWPzN2b+kM+TjZ5Dtiln+Zbk/QToCDFir+CIKHshpgtCPAvVkjmldeqqflKKUkShTjWfF2zRwEql58DGaTuJqPgMhS9ZVDI5OL6VoecSxWOLSKCqGu4R+yJJnTRBSaoHNzBsq81psYk/yty+QofbWsJktjJc2r3JSuM8UUVkCVqcYS9wd/3vW3NbkqOL7KJhktsJa6sBZfTs1Yr1lpKqJou24CE1TGwTxiZ7SASjiRzbtK7J9jJBCjZ80hgEp/Cop0caaVw7aedo6xRC26X2TSm7ljAdvcPew9m6ayxuLaV9Nz mandlm@apache" ];
     };