diff --git a/configuration.nix b/configuration.nix
index bd953f1..0f105be 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -57,7 +57,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --asterisks --cmd Hyprland";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --asterisks --remember-session --cmd Hyprland";
         user = "greeter";
       };
     };
diff --git a/home.nix b/home.nix
index cfb9a2e..ec8b2a4 100644
--- a/home.nix
+++ b/home.nix
@@ -183,6 +183,22 @@
       #theme = "powerlevel10k/powerlevel10k";
     };
   };
+
+  programs.swaylock.enable = false;
+  wayland.windowManager.sway = {
+    enable = true;
+    extraOptions = [ "--unsupported-gpu" ];
+    config = rec {
+      modifier = "Mod1";
+      # Use kitty as default terminal
+      terminal = "kitty"; 
+      startup = [
+        # Launch Firefox on start
+        {command = "wayvnc 100.120.210.58";}
+      ];
+    };
+  };
+
   home.stateVersion = "23.05";
   programs.home-manager.enable = true;
 }