diff --git a/modules/paranoia/default.nix b/modules/paranoia/default.nix
index bb31976..699ab13 100644
--- a/modules/paranoia/default.nix
+++ b/modules/paranoia/default.nix
@@ -20,5 +20,6 @@ in
 
   config = mkIf cfg.enable {
     pub-solar.core.hibernation.enable = true;
+    services.logind.lidSwitch = "hibernate";
   };
 }
diff --git a/modules/sway/config/config.d/systemd.conf b/modules/sway/config/config.d/systemd.conf
index d6380d4..66759c4 100644
--- a/modules/sway/config/config.d/systemd.conf
+++ b/modules/sway/config/config.d/systemd.conf
@@ -5,4 +5,4 @@
 # https://github.com/swaywm/sway/wiki/Systemd-integration
 # Also, import the most important environment variables into the D-Bus and systemd
 # user environments (e.g. required for screen sharing and Pinentry prompts):
-exec "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"
+exec "systemctl --user import-environment; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd $IMPORT_ENVIRONMENT_ENV_LIST DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"
diff --git a/modules/sway/mako.service.nix b/modules/sway/mako.service.nix
index b155e14..1f210c7 100644
--- a/modules/sway/mako.service.nix
+++ b/modules/sway/mako.service.nix
@@ -5,7 +5,6 @@
     Documentation = [ "man:mako(1)" ];
     BindsTo = [ "sway-session.target" ];
     After = [ "sway-session.target" ];
-    # ConditionEnvironment requires systemd v247 to work correctly
     ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
   };
   Service = {
diff --git a/modules/sway/swayidle.service.nix b/modules/sway/swayidle.service.nix
index 3b87c61..f10675f 100644
--- a/modules/sway/swayidle.service.nix
+++ b/modules/sway/swayidle.service.nix
@@ -10,17 +10,15 @@
   Service = {
     Type = "simple";
     Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin";
-    ExecStart = if psCfg.paranoia.enable then ''
-      ${pkgs.swayidle}/bin/swayidle -w \
-      timeout 120 'swaymsg "output * dpms off"' \
-      timeout 150 'systemctl hibernate' \
-    '' else ''
-      ${pkgs.swayidle}/bin/swayidle -w \
-      timeout 600 'swaylock-bg' \
-      timeout 900 'swaymsg "output * dpms off"' \
-      resume 'swaymsg "output * dpms on"' \
-      before-sleep 'swaylock-bg'
-    '';
+    ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
+        after-resume 'swaymsg "output * dpms on"' \
+        before-sleep 'swaylock-bg' '' + (if psCfg.paranoia.enable then '' \
+        timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+        timeout 150 'systemctl hibernate'
+      '' else '' \
+        timeout 600 'swaylock-bg'
+        timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
+      '');
   };
   Install = {
     WantedBy = [ "sway-session.target" ];
diff --git a/modules/sway/waybar.service.nix b/modules/sway/waybar.service.nix
index 98b8ed3..0237612 100644
--- a/modules/sway/waybar.service.nix
+++ b/modules/sway/waybar.service.nix
@@ -4,8 +4,9 @@
     Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
     Documentation = "https://github.com/Alexays/Waybar/wiki/";
     BindsTo = [ "sway-session.target" ];
-    After = [ "graphical-session-pre.target" "network-online.target" ];
+    After = [ "sway-session.target" "network-online.target" ];
     Wants = [ "graphical-session-pre.target" "network-online.target" "blueman-applet.service" ];
+    ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
   };
 
   Service = {
diff --git a/pkgs/sway-service.nix b/pkgs/sway-service.nix
index f0b97ee..15781a1 100644
--- a/pkgs/sway-service.nix
+++ b/pkgs/sway-service.nix
@@ -1,6 +1,6 @@
 self: with self; ''
   # first import environment variables from the login manager
-  systemctl --user import-environment
+  systemctl --user import-environment $IMPORT_ENVIRONMENT_ENV_LIST DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP PATH;
   # then start the service
   exec systemctl --wait --user start sway.service
 ''
diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index 5bbfa8e..e922781 100644
--- a/profiles/base-user/session-variables.nix
+++ b/profiles/base-user/session-variables.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
   wlroots = psCfg.graphical.wayland;
@@ -77,10 +77,22 @@ let
     # TELEMETRY BS
     VUEDX_TELEMETRY = "off";
   };
+
+  envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;
+
+  # Here we merge an extra variable into the attrset called FULL_ENV_LIST.
+  # It's a list of the variable names defined above.
+  # We can use this to tell `systemctl import-environment` to import the full list above.
+  variablesWithMeta = lib.attrsets.zipAttrsWith (name: values: builtins.head values) [
+    variables
+    { IMPORT_ENVIRONMENT_ENV_LIST = lib.lists.foldl (a: b: a + " " + b) "IMPORT_ENVIRONMENT_ENV_LIST" envListNames; }
+  ];
 in
 {
   home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
-    home.sessionVariables = variables;
-    systemd.user.sessionVariables = variables;
+    home.sessionVariables = variablesWithMeta;
+    systemd.user.sessionVariables = variablesWithMeta;
   };
+
+  environment.variables = variablesWithMeta;
 }