From a1aa693af953f680002bd56ec841a30b0d9d4f6c Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Sun, 1 Mar 2020 21:34:32 +0300
Subject: [PATCH] Update modules/users.nix modules/workspace/i3/default.nix

---
 modules/users.nix                | 2 +-
 modules/workspace/i3/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/users.nix b/modules/users.nix
index 60b22e6..2ac7ddf 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -39,7 +39,7 @@
   services.udev.extraRules = ''
     ACTION=="remove", ATTRS{idVendor}=="1050, RUN+="${
       pkgs.writeShellScript "lock-system"
-      "/run/wrappers/bin/sudo -u balsoft 'swaylock -f -c ${
+      "/run/wrappers/bin/sudo -u balsoft 'XDG_RUNTIME_DIR=/run/user/1000/ ${pkgs.swaylock}/bin/swaylock -f -c ${
         builtins.substring 1 7 config.themes.colors.bg
       }'"
     }"'';
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index a06c9ba..3430759 100755
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -161,9 +161,9 @@ in {
         "${modifier}+v" = "split v";
         "${modifier}+F1" = "move to scratchpad";
         "${modifier}+F2" = "scratchpad show";
-        "${modifier}+F11" = "output * dpms off";
+        "${modifier}+F11" = "exec swaylock -f -c ${builtins.substring 1 7 thm.bg}; output * dpms off";
         "${modifier}+F12" = "output * dpms on";
-        "${modifier}+End" = "swaylock -f -c ${builtins.substring 1 7 thm.bg}";
+        "${modifier}+End" = "exec swaylock -f -c ${builtins.substring 1 7 thm.bg}";
         "${modifier}+p" = "sticky toggle";
         "${modifier}+i" =
           script "0x0" ''wl-paste | curl -F"file=@-" https://0x0.st | wl-copy'';