From dc2180c4cb73c958ee73465c0e66a80ee7992dd7 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 21 Jul 2024 21:05:21 -0400
Subject: [PATCH] home/sway: use wayland helpers

---
 homeManagerModules/desktop/sway/default.nix   | 50 ++++++-------------
 .../desktop/wayland/helpers.nix               |  4 +-
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index a747f879..088ae083 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -12,7 +12,9 @@
       then true
       else false;
 
-    wayland.windowManager.sway = {
+    wayland.windowManager.sway = let
+      helpers = import ../wayland/helpers.nix {inherit config lib pkgs;};
+    in {
       enable = true;
       wrapperFeatures.gtk = true;
       checkConfig = false;
@@ -27,8 +29,6 @@
         editor = lib.getExe config.ar.home.defaultApps.editor;
         terminal = lib.getExe config.ar.home.defaultApps.terminal;
 
-        media = lib.getExe pkgs.playerctl;
-
         # Sway desktop utilities
         bar = lib.getExe pkgs.waybar;
         launcher = lib.getExe pkgs.fuzzel;
@@ -38,7 +38,7 @@
         lock = lib.getExe pkgs.swaylock;
         idled = pkgs.writeShellScript "sway-idled" ''
           ${lib.getExe pkgs.swayidle} -w \
-            before-sleep '${media} pause' \
+            before-sleep '${helpers.media} pause' \
             before-sleep '${lock}' \
             timeout 240 '${lib.getExe pkgs.brightnessctl} -s set 10' \
               resume '${lib.getExe pkgs.brightnessctl} -r' \
@@ -52,10 +52,6 @@
           }
         '';
 
-        screenshot = lib.getExe' pkgs.shotman "shotman";
-        screenshot_screen = "${screenshot} --capture output";
-        screenshot_region = "${screenshot} --capture region";
-
         cycleSwayDisplayModes = pkgs.writeShellScriptBin "cycleSwayDisplayModes" ''
           # TODO: remove petalburg hardcodes
           current_mode=$(${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"} -t get_outputs -p | grep "Current mode" | grep -Eo '[0-9]+x[0-9]+ @ [0-9.]+ Hz' | tr -d " " | grep 2880)
@@ -231,8 +227,8 @@
           "XF86Launch3" = "exec ${lib.getExe cycleSwayDisplayModes}";
 
           # Screenshots
-          "PRINT" = "exec ${screenshot_screen}";
-          "${modifier}+PRINT" = "exec ${screenshot_region}";
+          "PRINT" = "exec ${helpers.screenshot.screen}";
+          "${modifier}+PRINT" = "exec ${helpers.screenshot.region}";
 
           # Show/hide waybar
           "${modifier}+F11" = "exec pkill -SIGUSR1 waybar";
@@ -370,30 +366,16 @@
         workspaceAutoBackAndForth = true;
       };
 
-      extraConfig = let
-        brightness = lib.getExe' pkgs.swayosd "swayosd-client";
-        brightness_up = "${brightness} --brightness=raise";
-        brightness_down = "${brightness} --brightness=lower";
-        volume = brightness;
-        volume_up = "${volume} --output-volume=raise";
-        volume_down = "${volume} --output-volume=lower";
-        volume_mute = "${volume} --output-volume=mute-toggle";
-        mic_mute = "${volume} --input-volume=mute-toggle";
-        media = lib.getExe pkgs.playerctl;
-        media_play = "${media} play-pause";
-        media_next = "${media} next";
-        media_prev = "${media} previous";
-      in ''
-        bindsym --locked XF86MonBrightnessUp exec ${brightness_up}
-        bindsym --locked XF86MonBrightnessDown exec ${brightness_down}
-        bindsym --locked XF86AudioRaiseVolume exec ${volume_up}
-        bindsym --locked XF86AudioLowerVolume exec ${volume_down}
-        bindsym --locked XF86AudioMute exec ${volume_mute}
-        bindsym --locked XF86AudioMicMute exec ${mic_mute}
-        bindsym --locked XF86AudioPlay exec ${media_play}
-        bindsym --locked XF86AudioPrev exec ${media_prev}
-        bindsym --locked XF86AudioNext exec ${media_next}
-        bindsym --locked XF86Launch2 exec ${media_play}
+      extraConfig = ''
+        bindsym --locked XF86MonBrightnessUp exec ${helpers.brightness.up}
+        bindsym --locked XF86MonBrightnessDown exec ${helpers.brightness.down}
+        bindsym --locked XF86AudioRaiseVolume exec ${helpers.volume.up}
+        bindsym --locked XF86AudioLowerVolume exec ${helpers.volume.down}
+        bindsym --locked XF86AudioMute exec ${helpers.volume.mute}
+        bindsym --locked XF86AudioMicMute exec ${helpers.mic.mute}
+        bindsym --locked XF86AudioPlay exec ${helpers.media.play}
+        bindsym --locked XF86AudioPrev exec ${helpers.media.prev}
+        bindsym --locked XF86AudioNext exec ${helpers.media.next}
 
         mode "move" {
           bindgesture swipe:right move container to workspace prev; workspace prev
diff --git a/homeManagerModules/desktop/wayland/helpers.nix b/homeManagerModules/desktop/wayland/helpers.nix
index 40e77152..c4e247eb 100644
--- a/homeManagerModules/desktop/wayland/helpers.nix
+++ b/homeManagerModules/desktop/wayland/helpers.nix
@@ -20,7 +20,7 @@
   screenshot = {
     region = pkgs.writeShellScript "screenshot-region" ''
       FILENAME=$HOME/pics/screenshots/$(date +'%Y-%m-%d-%H:%M_grim.png')
-      
+
       ${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp})" "$FILENAME"
       ${lib.getExe' pkgs.wl-clipboard-rs "wl-copy"} $FILENAME
       ${lib.getExe' pkgs.libnotify "notify-send"} "Screenshot saved" "$FILENAME" -i "$FILENAME"
@@ -28,7 +28,7 @@
 
     screen = pkgs.writeShellScript "screenshot-screen" ''
       FILENAME=$HOME/pics/screenshots/$(date +'%Y-%m-%d-%H:%M_grim.png')
-      
+
       ${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp} -o)" "$FILENAME"
       ${lib.getExe' pkgs.wl-clipboard-rs "wl-copy"} $FILENAME
       ${lib.getExe' pkgs.libnotify "notify-send"} "Screenshot saved" "$FILENAME" -i "$FILENAME"