diff --git a/fschl/systems/common.scm b/fschl/systems/common.scm
index d65243f..0986fda 100644
--- a/fschl/systems/common.scm
+++ b/fschl/systems/common.scm
@@ -48,22 +48,27 @@
                      ("QT_QPA_PLATFORM" . "wayland-egl")))
 
    ;; Set up the shell environment
-;;   (service home-bash-service-type
-;;            (home-bash-configuration
-;;             (bash-profile
-;;              `(,(plain-file "bash-profile-extras"
-;;                             (string-append
-;;                              ;; Load the Nix profile
-;;                              "if [ -f /run/current-system/profile/etc/profile.d/nix.sh ]; then\n"
-;;                              "  . /run/current-system/profile/etc/profile.d/nix.sh\n"
-;;                              "fi\n"))))
-;;             (bashrc
-;;              `(,(local-file "../files/bash-prompt")))))
+  (service home-bash-service-type
+           (home-bash-configuration
+            (bash-profile
+             `(,(plain-file "bash-profile-extras"
+                            (string-append
+                             ;; Load the Nix profile
+                             "if [ -f /run/current-system/profile/etc/profile.d/nix.sh ]; then\n"
+                             "  . /run/current-system/profile/etc/profile.d/nix.sh\n"
+                              "fi\n"))
+                ,(plain-file "bash-sway-login"
+                             (string-append
+                              "if [ -z \"$WAYLAND_DISPLAY\" ] && [ \"$XDG_VTNR\" -eq 1 ]; then\n"
+                              "  exec sway\n"
+                              "fi\n"))))
+             (bashrc
+              `(,(local-file "../files/bash-prompt")))))
 
    ;; Place other files
- ;;  (simple-service 'profile-files-service
- ;;                  home-files-service-type
- ;;                  (list `(".inputrc" ,(local-file "../files/inputrc"))))
+  (simple-service 'profile-files-service
+                  home-files-service-type
+                  (list `(".inputrc" ,(local-file "../files/inputrc"))))
 
    ;; GnuPG configuration
 ;;   (service home-gpg-agent-service-type