From 8983481dc1b1733400807103defd72e45a938725 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Mon, 2 Mar 2020 12:46:59 +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, 4 insertions(+), 2 deletions(-)

diff --git a/modules/users.nix b/modules/users.nix
index cce5199..9343a61 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -40,6 +40,8 @@
     ACTION=="remove", ATTRS{idVendor}=="1050", RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"
   '';
 
+  security.wrappers.vlock.source = "${pkgs.vlock}/bin/vlock";
+  
   security.pam.u2f = {
     control = "sufficient";
     cue = true;
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index bd35d2b..9c696d8 100755
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -2,8 +2,8 @@
 let
   thm = config.themes.colors;
   apps = config.defaultApplications;
-  lock_fork = "swaylock -f -c ${builtins.substring 1 7 thm.bg}";
-  lock = pkgs.writeShellScript "lock" "swaymsg 'output * dpms off'; swaylock -c ${builtins.substring 1 7 thm.bg}; swaymsg 'output * dpms on'";
+  lock_fork = pkgs.writeShellScript "lock_fork" "/run/wrappers/bin/vlock -san &";
+  lock = pkgs.writeShellScript "lock" "swaymsg 'output * dpms off'; /run/wrappers/bin/vlock -san; swaymsg 'output * dpms on'";
 in {
   environment.sessionVariables._JAVA_AWT_WM_NONREPARENTING = "1";