patch(system/power): unmount-samba before-sleep (#54)

piyoki · Feb 21, 2024 · 1569d2d · 1569d2d
1 parent 83f6637
commit 1569d2d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/home/services/systemd/powermanagement/swayidle.nix b/home/services/systemd/powermanagement/swayidle.nix
@@ -1,8 +1,9 @@
-{ inputs, pkgs, system, ... }:
+{ inputs, pkgs, config, system, ... }:
 
 # $HOME/.config/systemd/user/swayidle.service
 let
   swayidleBin = inputs.nixpkgs-wayland.packages.${system}.swayidle;
+  swaylockBin = inputs.nixpkgs-wayland.packages.${system}.swaylock-effects;
   swBin = "/run/current-system/sw/bin";
 in
 {
@@ -15,10 +16,10 @@ in
       ExecStart = "${pkgs.writeShellScript "lockscreen" ''
         set -eux
         ${swayidleBin}/bin/swayidle -w \
-          timeout 300 'swaylock -f' \
+          timeout 300 '${swaylockBin}/bin/swaylock -f' \
           timeout 360 'hyprctl dispatch dpms off' \
           resume 'hyprctl dispatch dpms on' \
-          before-sleep 'swaylock -f'
+          before-sleep 'unmount-samba && ${swaylockBin}/bin/swaylock -f'
       ''}";
       ExecStartPost = "${swBin}/sleep 1";
       ExecStop = "${pkgs.writeShellScript "lockscreen" ''
@@ -29,7 +30,7 @@ in
       RemainAfterExit = "yes";
       Type = "oneshot";
       Environment = [
-        "PATH=$PATH:/run/current-system/sw/bin"
+        "PATH=$PATH:/run/current-system/sw/bin:${config.home.homeDirectory}/.local/scripts"
       ];
     };
   };

diff --git a/system/services/powermanagement.nix b/system/services/powermanagement.nix
@@ -61,21 +61,23 @@ in
   };
 
   # systemd unit
-  # set battery charge max and min threshold
-  systemd.services."battery_charge_threshold" = {
-    wantedBy = [ "multi-user.target" ];
-    after = [ "multi-user.target" ];
-    description = "Set the battery charge threshold";
-    serviceConfig = {
-      ExecStart = "${pkgs.writeShellScript "lockscreen" ''
+  systemd.services = {
+    # set battery charge max and min threshold
+    "battery_charge_threshold" = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "multi-user.target" ];
+      description = "Set the battery charge threshold";
+      serviceConfig = {
+        ExecStart = "${pkgs.writeShellScript "lockscreen" ''
         set -eux
         ${swBin}/echo 0 > /sys/class/power_supply/BAT0/charge_control_start_threshold
         ${swBin}/echo 80 > /sys/class/power_supply/BAT0/charge_control_end_threshold
       ''}";
-      Type = "oneshot";
-      Environment = [
-        "PATH=$PATH:${swBin}"
-      ];
+        Type = "oneshot";
+        Environment = [
+          "PATH=$PATH:${swBin}"
+        ];
+      };
     };
   };