about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2021-12-16T05·11-0500
committerwpcarro <wpcarro@gmail.com>2021-12-16T22·07+0000
commitec76f6264db80329bc8ac6172753f7dd45c7eed9 (patch)
treeb33a13a9465457389ec3dd38bcf755eb886937a2
parent854dcbc55effd17d8ae3d5cc3b9cc090ecf174e6 (diff)
feat(wpcarro/marcus): Install xsecurelock r/3275
TL;DR:
- Install `xsecurelock`
- Support screen-locking for personal (and corporate) devices

Change-Id: Ife2ead109c60b69b817775d8d6524c6aece5f376
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4354
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
-rw-r--r--users/wpcarro/emacs/.emacs.d/wpc/window-manager.el6
-rw-r--r--users/wpcarro/nixos/marcus/default.nix1
2 files changed, 5 insertions, 2 deletions
diff --git a/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el b/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el
index 6030461da6..0ab5a63d61 100644
--- a/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el
+++ b/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el
@@ -195,7 +195,9 @@
 ;; TODO: Is there a shell-command API that accepts an alist and serializes it
 ;; into variables to pass to the shell command?
 (defconst window-manager--xsecurelock
-  "/usr/share/goobuntu-desktop-files/xsecurelock.sh"
+  (if (device-corporate?)
+      "/usr/share/goobuntu-desktop-files/xsecurelock.sh"
+    "xsecurelock")
   "Path to the proper xsecurelock executable.
 The other path to xsecurelock is /usr/bin/xsecurelock, which works fine, but it
 is not optimized for Goobuntu devices.  Goobuntu attempts to check a user's
@@ -347,7 +349,7 @@ predicate."
 
 (add-hook 'exwm-init-hook
           (lambda ()
-            (display-arrange-primary)
+            ;; (display-arrange-primary)
             (window-manager--switch "Coding")))
 
 (provide 'window-manager)
diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix
index f37420883f..293b9dc73a 100644
--- a/users/wpcarro/nixos/marcus/default.nix
+++ b/users/wpcarro/nixos/marcus/default.nix
@@ -83,6 +83,7 @@ in {
     weechat
     wpcarros-emacs
     xclip
+    xsecurelock
   ];
 
   system.stateVersion = "21.11";