diff --git a/config.nix b/config.nix
index 1d52cbf..7aa98e8 100644
--- a/config.nix
+++ b/config.nix
@@ -18,6 +18,11 @@ in
   programs.vim.enable = true;
   programs.vim.defaultEditor = true;
 
+  services = {
+    xserver = {
+      xkb.layout = "de";
+    };
+  };
   console = {
     enable = true;
     useXkbConfig = true;
@@ -60,29 +65,24 @@ in
           git
         ];
       };
+<<<<<<< HEAD
 
       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/*
         '';
       };
 
+=======
+      wayland.windowManager.sway.config.startup = [
+        { command = "firefox-esr --kiosk c3nav.de"; always = true; }
+      ];
+>>>>>>> f295282 (Attempt to fix the hardcoded device)
       programs = {
         firefox = {
           enable = true;
@@ -139,22 +139,6 @@ 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 = {
@@ -192,7 +176,7 @@ in
     disk = {
       main = {
         type = "disk";
-        device = "/dev/sdb";
+        device = "/dev/sda";
         content = {
           type = "gpt";
           partitions = {