From b4ca5c14f6ac3d408035a00bd43bb0fd87e8814e Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Thu, 31 Oct 2024 01:09:39 +0530
Subject: Enable bslock

---
 packages.nix            | 18 ++++++++++--------
 packages/bslock/pkg.nix |  8 +++-----
 packages/bslock/source  |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages.nix b/packages.nix
index 2cc83d8..67827a4 100644
--- a/packages.nix
+++ b/packages.nix
@@ -11,7 +11,7 @@ let
     st
     dmenu
     anypinentry
-    # bslock
+    bslock
     # sidekick
   ];
 
@@ -196,11 +196,13 @@ in
   };
 
   # Security wrappers
-  # security.wrappers = {
-  #   bslock = {
-  #     owner = config.users.users.imsohexy.name;
-  #     group = "users";
-  #     source = "${localPkgs.bslock}/bin/bslock";
-  #   };
-  # };
+  security.wrappers = {
+    bslock = {
+      # owner = config.users.users.imsohexy.name;
+      owner = "root";
+      setuid = true;
+      group = "root";
+      source = "${localPkgs.bslock}/bin/bslock";
+    };
+  };
 }
diff --git a/packages/bslock/pkg.nix b/packages/bslock/pkg.nix
index edca2ba..a38f832 100644
--- a/packages/bslock/pkg.nix
+++ b/packages/bslock/pkg.nix
@@ -1,6 +1,4 @@
-{ stdenv, pkgs, xorgproto, libX11, libXinerama, libXext, libXrandr }:
-with pkgs.lib;
-
+{ stdenv, pkgs, xorgproto, libX11, libXinerama, libXext, libXrandr, libxcrypt }:
 let
   user = "imsohexy";
   group = "users";
@@ -10,12 +8,12 @@ in stdenv.mkDerivation rec {
 
   src = ./source;
 
-  buildInputs = [ xorgproto libX11 libXinerama libXext libXrandr ];
+  buildInputs = [ xorgproto libX11 libXinerama libXext libXrandr libxcrypt ];
 
   unpackPhase = ''cp -r $src/* .'';
 
   postPatch = "
-    # sed -e 's/@@user/${user}/' -e 's/@@group/${group}/' -i config.def.h;
+    sed -e 's/{{user}}/${user}/' -e 's/{{group}}/${group}/' -i config.def.h;
     sed -i '/chmod u+s/d' Makefile;
   ";
 
diff --git a/packages/bslock/source b/packages/bslock/source
index 7a494a6..041e36d 160000
--- a/packages/bslock/source
+++ b/packages/bslock/source
@@ -1 +1 @@
-Subproject commit 7a494a619ce169b56bd37db2ef69cd09c63c643a
+Subproject commit 041e36d529871e7c0d7e2d1f46b198daa8e68b6e
-- 
cgit v1.3.1