diff --git a/config.nix b/config.nix
index 7aa98e8..9d8694f 100644
--- a/config.nix
+++ b/config.nix
@@ -18,11 +18,6 @@ in
   programs.vim.enable = true;
   programs.vim.defaultEditor = true;
 
-  services = {
-    xserver = {
-      xkb.layout = "de";
-    };
-  };
   console = {
     enable = true;
     useXkbConfig = true;
@@ -53,6 +48,7 @@ in
   ];
 
   home-manager = {
+    backupFileExtension = "backup";
     users.c3terminal = {
       home = {
         username = config.users.users.c3terminal.name;
@@ -69,12 +65,21 @@ in
 
       wayland.windowManager.sway = {
         enable = true;
+        config = {
+          startup = [
+            {
+              command = "firefox-esr --kiosk c3nav.de";
+            }
+          ];
+          fonts = {
+            names = [ "Noto Sans" ];
+            style = "regular";
+            size = 30.0;
+          };
+        };
         extraConfig = ''
           set $ws1 c3nav
           default_border none
-          font pango: "Noto Sans" regular 30
-          exec swaymsg "workspace $ws1;exec firefox-esr --name=c3nav --no-remote -P "terminal" https://c3nav.de; workspace $ws2; exec firefox-esr --name=fahrplan --no-remote -P "default" https://fahrplan.events.ccc.de/congress/2024/fahrplan/schedule/"
-          include /etc/sway/config.d/*
         '';
       };
 
@@ -101,6 +106,13 @@ in
               "zoom.minPercent" = lock 100;
             };
           };
+          profiles = {
+            default = {
+              id = 0;
+              isDefault = true;
+              name = "default";
+            };
+          };
         };
       };
     };
@@ -139,6 +151,22 @@ in
         PasswordAuthentication = false;
       };
     };
+    xserver = {
+      enable = true;
+      xkb.layout = "de";
+      displayManager = {
+        defaultSession = "sway";
+        sessionData.autologinSession = "sway";
+        autoLogin = {
+          enable = true;
+          user = "c3terminal";
+        };
+        lightdm = {
+          greeter.enable = false;
+          enable = true;
+        };
+      };
+    };
   };
 
   programs.sway = {
@@ -176,7 +204,7 @@ in
     disk = {
       main = {
         type = "disk";
-        device = "/dev/sda";
+        device = "/dev/sdb";
         content = {
           type = "gpt";
           partitions = {