diff --git a/modules/locales.nix b/modules/locales.nix
index 408a405..91f7c3d 100644
--- a/modules/locales.nix
+++ b/modules/locales.nix
@@ -5,9 +5,4 @@
   console.keyMap = "de";
 
   time.timeZone = "Europe/Berlin";
-
-  location = {
-    latitude = 49.52;
-    longitude = 10.17;
-  };
 }
diff --git a/modules/sway.nix b/modules/sway.nix
index 7d35bef..7693ded 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -1,44 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  programs.sway = {
-    enable = true;
-    extraPackages = with pkgs; [
-      swaylock # lockscreen
-      swayidle # autolock
-      xwayland # for legacy apps
-      unstable.waybar # better status bar FIXME: 0.9.3 is broken, 0.9.4 from unstable works
-      mako # notification daemon
-      #kanshi # autorandr
-      alacritty # temrinal
-      dmenu-wayland # launcher
-      brightnessctl # control screen brightness
-      #redshift-wlr # natural color temperature
-      sway-contrib.grimshot # screenshots
-    ];
-    extraSessionCommands = ''
-      export CLUTTER_BACKEND=wayland
-      export GDK_BACKEND=wayland
-      export MOZ_ENABLE_WAYLAND=1
-      export QT_QPA_PLATFORM=wayland-egl
-      export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-      export SDL_VIDEODRIVER=wayland
-      export WLR_NO_HARDWARE_CURSORS=1
-      export _JAVA_AWT_WM_NONREPARENTING=1
-    '';
-  };
-
-  services.redshift = {
-    enable = true;
-    package = pkgs.redshift-wlr;
-    extraOptions = [ "-v" "-m" "wayland" ];
-    temperature = {
-      day = 6500;
-      night = 3500;
-    };
-  };
-
-  systemd.user.targets.graphical-session.wantedBy = [ "multi-user.target" ];
+  programs.sway.enable = true; # actual configuration happens in home-manager
 
   services.logind.lidSwitchDocked = config.services.logind.lidSwitch;
 }
diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix
index e88c738..15b1768 100644
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@@ -215,6 +215,25 @@ in
       export _JAVA_AWT_WM_NONREPARENTING=1
     '';
   };
+
+  # Start on tty1
+  home.file = {
+    ".zprofile".text = ''
+      if [[ -z $WAYLAND_DISPLAY ]] && [[ $(tty) = /dev/tty1 ]] && command -v sway >/dev/null ; then
+          systemctl --user start graphical-session.target
+          export XDG_SESSION_TYPE="wayland"
+          exec sway
+      fi
+    '';
+  };
+
+  home.packages = with pkgs; [
+    alacritty # terminal
+    brightnessctl # control screen brightness
+    sway-contrib.grimshot # screenshots
+    unstable.waybar # better status bar FIXME: 0.9.3 is broken, 0.9.4 from unstable works
+  ];
+
   xdg.configFile = {
     # home-manager’s waybar module performs additional checks that are overly strict
     "waybar/config".text = builtins.toJSON {
@@ -379,15 +398,6 @@ in
       src = ../files/waybar/style.css;
     } // solarized);
   };
-  home.file = {
-    ".zprofile".text = ''
-      if [[ -z $WAYLAND_DISPLAY ]] && [[ $(tty) = /dev/tty1 ]] && command -v sway >/dev/null ; then
-          systemctl --user start graphical-session.target
-          export XDG_SESSION_TYPE="wayland"
-          exec sway
-      fi
-    '';
-  };
 
   programs.mako = {
     enable = true;
@@ -401,4 +411,16 @@ in
 
     defaultTimeout = 5000;
   };
+
+  services.redshift = {
+    enable = true;
+    package = pkgs.redshift-wlr;
+    extraOptions = [ "-v" "-m" "wayland" ];
+    latitude = "49.52";
+    longitude = "10.17";
+    temperature = {
+      day = 6500;
+      night = 3500;
+    };
+  };
 }