diff --git a/nate/dotfiles/waybar/config b/nate/dotfiles/waybar/config
index a8b33b8..8c20d9b 100644
--- a/nate/dotfiles/waybar/config
+++ b/nate/dotfiles/waybar/config
@@ -199,7 +199,7 @@
 
     "custom/spotify": {
         "format": " ",
-        "on-click": "xfce4-terminal -e 'ncspot'",
+        "on-click": "foot -e 'ncspot'",
         "tooltip": false
     },
 
diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix
index 9885b22..90b9e66 100644
--- a/nate/modules/sway/sway_conf.nix
+++ b/nate/modules/sway/sway_conf.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, userName, ... }:
 {
     options.swaywm = {
         enable = lib.mkEnableOption "Enable sway window manager.";
@@ -86,9 +86,10 @@
             # ])
         ];
 
-        environment.loginShellInit = ''
-            [[ "$(tty)" == /dev/tty1 ]] && sway
-        '';
+        # environment.loginShellInit = ''
+        #     [[ "$(tty)" == /dev/tty1 ]] && sway
+        # '';
+
         # Thunar config
         programs.thunar = {
             enable = true;
@@ -119,7 +120,7 @@
         services.pipewire = {
           enable = true;
           alsa.enable = true;
-          alsa.support32Bit = true;
+          # alsa.support32Bit = true;
           pulse.enable = true;
           wireplumber.enable = true;
         };
@@ -131,10 +132,25 @@
         # Necessary for home-manager sway setup
         security.polkit.enable = true;
 
-        services.xserver.enable = true;
-        services.xserver.displayManager.defaultSession = "sway";
-        services.xserver.displayManager.gdm.enable = true;
-        services.xserver.displayManager.gdm.wayland = true;
+        # services.xserver.enable = true;
+        # services.xserver.displayManager.defaultSession = "sway";
+        # services.xserver.displayManager.gdm.enable = true;
+        # services.xserver.displayManager.gdm.wayland = true;
+        # services.xserver.displayManager.gdm.settings = {
+            # greeter.includeAll = false;
+            # greeter.include = "nate";
+        # };
+
+        services.greetd = {
+          enable = true;
+          settings = rec {
+            initial_session = {
+              command = "${pkgs.sway}/bin/sway";
+              user = "nate";
+            };
+            default_session = initial_session;
+          };
+        };
 
         services.xserver.videoDrivers = [ "amdgpu" ];
         # Enable HIP