diff --git a/cfg/sway/config b/cfg/sway/config
index 4a448f6..9e124b2 100644
--- a/cfg/sway/config
+++ b/cfg/sway/config
@@ -6,6 +6,9 @@ set $right l
 set $term kitty
 set $menu bemenu-run | xargs swaymsg exec --
 
+exec swaymsg "workspace 1; exec kitty"
+exec swaymsg "workspace 2; exec brave"
+
 output * bg $HOME/pic/bg.png fill
     # Start a terminal
     bindsym $mod+Return exec $term
diff --git a/configuration.nix b/configuration.nix
index 56198ec..543fd49 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -130,10 +130,6 @@
       enable = true;
       enableSSHSupport = true;
     };
-    sway = {
-      enable = true;
-      wrapperFeatures.gtk = true;
-    };
     zsh.enable = true;
     nix-ld.enable = true;
   };
diff --git a/home.nix b/home.nix
index 3c452ae..9dd938c 100644
--- a/home.nix
+++ b/home.nix
@@ -53,6 +53,14 @@
         		set -g base-index 1
       '';
     };
+    swaylock = {
+      enable = true;
+      settings = {
+        color = "000000";
+        line-color = "ffffff";
+        show-failed-attempts = true;
+      };
+    };
     neovim = {
       enable = true;
       viAlias = true;
@@ -74,7 +82,7 @@
         stylua
       ];
       plugins = with pkgs.vimPlugins; [
-	gitsigns-nvim
+        gitsigns-nvim
         autoclose-nvim
         barbar-nvim
         cmp-nvim-lsp
@@ -99,6 +107,9 @@
       enable = true;
       enableSyntaxHighlighting = true;
       enableAutosuggestions = true;
+      loginExtra = ''
+        [ "$(tty)" = "/dev/tty1" ] && exec sway
+      '';
       shellAliases = {
         gad = "git add . && git diff --cached";
         gac = "ga && gc";
@@ -134,15 +145,19 @@
       ];
     };
   };
+  wayland = {
+    windowManager.sway = {
+      enable = true;
+      config = null;
+      extraConfig = builtins.readFile ./cfg/sway/config;
+    };
+  };
   xdg.configFile = {
     "nix/nix.conf" = {
       text = ''
         experimental-features = nix-command flakes
       '';
     };
-    "sway/config" = {
-      source = ./cfg/sway/config;
-    };
     "user-dirs.dirs" = {
       source = pkgs.writeText "user-dirs.dirs" ''
         XDG_DESKTOP_DIR="dt"