diff --git a/configs/nixos/common.nix b/configs/nixos/common.nix
index 02658fc..b9a8a0e 100644
--- a/configs/nixos/common.nix
+++ b/configs/nixos/common.nix
@@ -32,6 +32,7 @@ in {
   ];
 
   services.localtimed.enable= config.host.details.isLaptop;
+  services.geoclue2.enable=true;
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
diff --git a/configs/nixos/i3/lockscreen.nix b/configs/nixos/i3/lockscreen.nix
index 864db70..7d08234 100644
--- a/configs/nixos/i3/lockscreen.nix
+++ b/configs/nixos/i3/lockscreen.nix
@@ -4,18 +4,20 @@
   lib,
   ...
 }: {
+#TODO: use xss-lock
   systemd.services.betterlockscreen = {
     enable = true;
     description = "Locks screen when going to sleep/suspend";
-    environment = {DISPLAY = "0";};
+    environment = {DISPLAY = ":0";};
     serviceConfig = {
       User = config.host.details.user;
-      alias = ["betterlockscreen@${config.host.details.user}.service"];
       Type = "simple";
-      ExecStart = ''${pkgs.betterlockscreen}/bin/betterlockscreen --lock dim'';
+      ExecStart = ''${lib.getExe pkgs.betterlockscreen} --lock dim'';
+      ExecStartPost = ''${pkgs.coreutils}/bin/sleep 1'';
       TimeoutSec = "infinity";
     };
-    wantedBy = ["sleep.target" "suspend.target"];
+    wantedBy = ["sleep.target"];
+    before = ["sleep.target"];
   };
 
   home-manager.users.${config.host.details.user} = {