diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index 83e17299..10a01174 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -89,6 +89,16 @@ in
   };
 
   services = {
+    greetd = {
+      enable = true;
+      settings = rec {
+        initial_session = {
+          command = "sway";
+          user = "misterio";
+        };
+        default_session = initial_session;
+      };
+    };
     pipewire = {
       enable = true;
       alsa.enable = true;
diff --git a/hosts/common.nix b/hosts/common.nix
index 9e8500ff..d60a0343 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -15,7 +15,7 @@
 
   environment = {
     # Activate home-manager environment, if not already enabled
-    loginShellInit = ''[ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate 2> /dev/null'';
+    loginShellInit = ''[ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null'';
 
     homeBinInPath = true;
     localBinInPath = true;
diff --git a/hosts/pleione/default.nix b/hosts/pleione/default.nix
index 1c18a8d7..49eddc11 100644
--- a/hosts/pleione/default.nix
+++ b/hosts/pleione/default.nix
@@ -42,6 +42,16 @@
   };
 
   services = {
+    greetd = {
+      enable = true;
+      settings = rec {
+        initial_session = {
+          command = "sway";
+          user = "misterio";
+        };
+        default_session = initial_session;
+      };
+    };
     pipewire = {
       enable = true;
       alsa.enable = true;