From 21ddbd068e790f78cad15a726cbf8f45c9b430b4 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Sat, 7 Jan 2023 21:23:29 -0700
Subject: [PATCH] fix locking bugs

---
 home-manager/modules/ezpcusr.nix | 11 +++++++----
 home-manager/users/notgne2.nix   |  1 +
 modules/ezpc.nix                 |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index d25105a..9547f5c 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -7,8 +7,11 @@ inputs: {
 with lib; let
   cfg = config.ezpcusr;
 
-  lockCommand = pkgs.writeScript "lock.sh" ''
-    ${pkgs.swaylock-effects}/bin/swaylock -f --clock --indicator --screenshots --effect-scale 0.8 --effect-blur 8x3 --effect-vignette 0.2:0.5 --fade-in 0.5 --text-color ${config.ezcolors.base16.base08} --inside-color ${config.ezcolors.base16.base00} --ring-color ${config.ezcolors.base16.base01} --datestr "%Y-%m-%e" --timestr "%I:%M %p"
+  # lockCommand = pkgs.writeScript "lock.sh" ''
+  #   ${pkgs.swaylock-effects}/bin/swaylock -f --clock --indicator --screenshots --effect-scale 0.8 --effect-blur 8x3 --effect-vignette 0.2:0.5 --fade-in 0.5 --text-color ${config.ezcolors.base16.base08} --inside-color ${config.ezcolors.base16.base00} --ring-color ${config.ezcolors.base16.base01} --datestr "%Y-%m-%e" --timestr "%I:%M %p"
+  # '';
+  lockCommand = pkgs.writeShellScript "lock.sh" ''
+    exec ${pkgs.swaylock}/bin/swaylock -f --text-color ${config.ezcolors.base16.base08} --inside-color ${config.ezcolors.base16.base00} --ring-color ${config.ezcolors.base16.base01} -c ${config.ezcolors.base16.base00}
   '';
 in {
   options.ezpcusr = {
@@ -76,7 +79,7 @@ in {
         }
         {
           event = "lock";
-          command = "${lockCommand}";
+          command = "${pkgs.playerctl}/bin/playerctl -a pause; ${lockCommand}";
         }
         {
           event = "unlock";
@@ -270,7 +273,7 @@ in {
                 "${modifier}+0" = "workspace 10";
                 "${modifier}+Shift+0" = "move container to workspace 10";
 
-                "Ctrl+Alt+l" = "exec ${lockCommand}";
+                "Ctrl+Alt+l" = "exec ${pkgs.systemd}/bin/loginctl lock-session";
               }
               // genKeyAttrs true
               // genKeyAttrs false
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index 48fd1dd..b00c2d7 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -260,5 +260,6 @@ in {
     userName = "notgne2";
     userEmail = "gen2@gen2.space";
     ignores = [".envrc"];
+    extraConfig.push.autoSetupRemote = true;
   };
 }
diff --git a/modules/ezpc.nix b/modules/ezpc.nix
index 4653641..089331a 100644
--- a/modules/ezpc.nix
+++ b/modules/ezpc.nix
@@ -44,7 +44,7 @@ in {
       vt = 7;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --remember --remember-user-session --cmd sway";
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --cmd sway";
         };
       };
     };