diff --git a/configuration.nix b/configuration.nix
index b71c0ad..9c93b84 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -44,7 +44,7 @@ in
 
   # Configure keymap in X11
   services.xserver.xkb = {
-    layout = "de";
+    layout = "de-latin1";
     variant = "";
   };
 
diff --git a/desktop-environment/config.nix b/desktop-environment/config.nix
index 38f763f..aadb7c9 100644
--- a/desktop-environment/config.nix
+++ b/desktop-environment/config.nix
@@ -21,12 +21,14 @@ in
     programs.dconf.enable = true;
     hardware.graphics.enable = true;
 
-    services.xserver = {
-        enable = true;
-        displayManager.lightdm = {
-            enable = true;
-            greeters.slick.enable = true;
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "Hyprland";
+          user = profile.username;
         };
+      };
     };
 
     xdg.portal = {
diff --git a/home-manager.nix b/home-manager.nix
index f5856bc..9ec6675 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -19,7 +19,7 @@ in
         extraGroups = [ "networkmanager" "wheel" "docker" "scanner" "lp"];
         packages = with pkgs; [];
         shell = pkgs.zsh;
-	    hashedPassword = profile.hashed-password;
+	hashedPassword = profile.hashed-password;
     };
 
     home-manager.backupFileExtension = "bck.lck";