From 9fda500a7ff01ef555155811adccdd6fa4825fc6 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Mon, 2 Mar 2020 12:58:15 +0300
Subject: [PATCH] Update modules/users.nix modules/workspace/i3/default.nix

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

diff --git a/modules/users.nix b/modules/users.nix
index 9343a61..2d955ba 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -39,15 +39,22 @@
   services.udev.extraRules = ''
     ACTION=="remove", ATTRS{idVendor}=="1050", RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"
   '';
-
-  security.wrappers.vlock.source = "${pkgs.vlock}/bin/vlock";
   
+  services.mingetty.autologinUser = "balsoft";
+  
+  environment.loginShellInit = "sudo /run/current-system/sw/bin/lock; sway";
+
   security.pam.u2f = {
     control = "sufficient";
     cue = true;
     enable = true;
   };
 
+  environment.systemPackages = [
+    (pkgs.writeShellScriptBin "lock"
+      "USER=balsoft ${pkgs.vlock}/bin/vlock -san")
+  ];
+
   security.pam.services = builtins.listToAttrs (builtins.map (name: {
     inherit name;
     value = { unixAuth = false; };
@@ -80,6 +87,7 @@
   security.sudo = {
     enable = true;
     extraConfig = ''
+      balsoft ALL = (root) NOPASSWD: /run/current-system/sw/bin/lock
       balsoft ALL = (root) NOPASSWD: ${pkgs.light}/bin/light -A 5
       balsoft ALL = (root) NOPASSWD: ${pkgs.light}/bin/light -U 5
     '';
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index 9c696d8..44b8965 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 = 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'";
+  lock_fork = pkgs.writeShellScript "lock_fork" "sudo /run/current-system/sw/bin/lock &";
+  lock = pkgs.writeShellScript "lock" "swaymsg 'output * dpms off'; sudo /run/current-system/sw/bin/lock; swaymsg 'output * dpms on'";
 in {
   environment.sessionVariables._JAVA_AWT_WM_NONREPARENTING = "1";