From cd45522a4618ddb570bddc4da52a616672352211 Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Mon, 24 Feb 2025 02:25:54 -0800
Subject: [PATCH] pkgs: relocate pipewire controller
---
home/modules/pipewire-controller.nix | 68 +----------------
home/modules/satty.nix | 31 ++++++++
modules/dwl.nix | 25 +++++++
pkgs/default.nix | 1 +
.../audio/discord-mute.mp3 | Bin
.../audio/discord-unmute.mp3 | Bin
pkgs/pipewire-controller/default.nix | 70 ++++++++++++++++++
7 files changed, 128 insertions(+), 67 deletions(-)
create mode 100644 home/modules/satty.nix
rename {home => pkgs/pipewire-controller}/audio/discord-mute.mp3 (100%)
rename {home => pkgs/pipewire-controller}/audio/discord-unmute.mp3 (100%)
create mode 100644 pkgs/pipewire-controller/default.nix
diff --git a/home/modules/pipewire-controller.nix b/home/modules/pipewire-controller.nix
index 8704b0e..66c6280 100644
--- a/home/modules/pipewire-controller.nix
+++ b/home/modules/pipewire-controller.nix
@@ -2,72 +2,6 @@
let
cfg = config.snowhawk.pipewire-controller;
-
- pipewire-controller =
- let
- mpv = lib.getExe pkgs.mpv;
- pamixer = lib.getExe pkgs.pamixer;
- in
- pkgs.writers.writeRustBin "pipewire-controller" { } ''
- use std::{process::Command, str};
-
- const MUTE_AUDIO: &str = "${../audio/discord-mute.mp3}";
- const UNMUTE_AUDIO: &str = "${../audio/discord-unmute.mp3}";
-
- fn main() {
- let mute_status = Command::new("${pamixer}")
- .args(["--default-source", "--get-mute"])
- .output()
- .expect("Unable to get mute status from pamixer")
- .stdout;
-
- let mute_status = str::from_utf8(&mute_status[..]).expect("pamixer output wasn't a string").trim();
-
- if mute_status == "false" {
- Command::new("${pamixer}")
- .args(["--default-source", "--mute"])
- .output()
- .expect("Unable to mute via pamixer");
-
- Command::new("${mpv}")
- .args(["--no-video", "--volume=80", MUTE_AUDIO])
- .output()
- .expect("Unable to play audio via mpv");
- } else {
- Command::new("${pamixer}")
- .args(["--default-source", "--unmute"])
- .output()
- .expect("Unable to unmute via pamixer");
-
- Command::new("${mpv}")
- .args(["--no-video", "--volume=80", UNMUTE_AUDIO])
- .output()
- .expect("Unable to play audio via mpv");
- }
-
- let xrootdatetime_pid_raw =
- Command::new("systemctl")
- .args([
- "--user",
- "show",
- "--property", "MainPID",
- "--value", "xrootdatetime"
- ])
- .output();
-
- if let Ok(xrootdatetime_pid_raw) = xrootdatetime_pid_raw {
- if let Ok(xrootdatetime_pid) = str::from_utf8(&xrootdatetime_pid_raw.stdout[..]) {
- let _ = Command::new("kill")
- .args([
- "-s",
- "SIGUSR1",
- xrootdatetime_pid
- ])
- .spawn();
- }
- }
- }
- '';
in
{
options.snowhawk.pipewire-controller = {
@@ -78,7 +12,7 @@ in
snowhawk.sxhkd.enable = true;
services.sxhkd.keybindings = {
- "XF86TouchpadOn" = "${lib.getExe pipewire-controller}";
+ "XF86TouchpadOn" = "${lib.getExe pkgs.pipewire-controller}";
};
};
}
diff --git a/home/modules/satty.nix b/home/modules/satty.nix
new file mode 100644
index 0000000..4e5b760
--- /dev/null
+++ b/home/modules/satty.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, lib, ... }:
+let
+ cfg = config.snowhawk.satty;
+in
+{
+ options.snowhawk.satty = {
+ enable = lib.mkEnableOption "satty module";
+ };
+
+ config = lib.mkIf cfg.enable {
+ home.packages = with pkgs; [
+ grim
+ jq
+ satty
+ slurp
+ wl-clipboard
+ astal.river
+ ];
+
+ xdg.configFile = {
+ "satty/config.toml".source = pkgs.writers.writeTOML "satty-config.toml" {
+ general = {
+ action-on-enter = "save-to-clipboard";
+ copy-command = "${pkgs.wl-clipboard}/bin/wl-copy -t image/png";
+ output-filename = "${config.home.homeDirectory}/Pictures/screenShots/screenshot-%FT%T.png";
+ save-after-copy = true;
+ };
+ };
+ };
+ };
+}
diff --git a/modules/dwl.nix b/modules/dwl.nix
index 25756a9..783e080 100644
--- a/modules/dwl.nix
+++ b/modules/dwl.nix
@@ -84,6 +84,31 @@ in
wmenu
kitty
cfg.package
+
+ pipewire-controller
+
+ (pkgs.writeShellApplication {
+ name = "sattySnap";
+
+ runtimeInputs = [ satty grim gawk gnugrep dwlmsg ];
+
+ text =
+ let
+ sattyArgs = lib.cli.toGNUCommandLineShell { } {
+ early-exit = true;
+ filename = "-";
+ fullscreen = true;
+ initial-tool = "crop";
+ };
+ in
+ ''
+ grim -o "$(dwlmsg -g | grep "selmon 1" | awk '{ print $1 }')" - | satty ${sattyArgs}
+ '';
+ })
+ ];
+
+ home-manager.sharedModules = [
+ { snowhawk.satty.enable = lib.mkDefault true; }
];
};
}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 5ad29d1..385b7fc 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -13,4 +13,5 @@ in
dwm-msg = callDefaultPackage ./dwm-msg;
dwlmsg = callDefaultPackage ./dwlmsg;
uhk-agent = callDefaultPackage ./uhk-agent;
+ pipewire-controller = callDefaultPackage ./pipewire-controller;
}
diff --git a/home/audio/discord-mute.mp3 b/pkgs/pipewire-controller/audio/discord-mute.mp3
similarity index 100%
rename from home/audio/discord-mute.mp3
rename to pkgs/pipewire-controller/audio/discord-mute.mp3
diff --git a/home/audio/discord-unmute.mp3 b/pkgs/pipewire-controller/audio/discord-unmute.mp3
similarity index 100%
rename from home/audio/discord-unmute.mp3
rename to pkgs/pipewire-controller/audio/discord-unmute.mp3
diff --git a/pkgs/pipewire-controller/default.nix b/pkgs/pipewire-controller/default.nix
new file mode 100644
index 0000000..e959e5d
--- /dev/null
+++ b/pkgs/pipewire-controller/default.nix
@@ -0,0 +1,70 @@
+{ pkgs
+, mpv
+, pamixer
+, lib
+}:
+
+let
+ mpvExe = lib.getExe mpv;
+ pamixerExe = lib.getExe pamixer;
+in
+pkgs.writers.writeRustBin "pipewire-controller" { } ''
+ use std::{process::Command, str};
+
+ const MUTE_AUDIO: &str = "${./audio/discord-mute.mp3}";
+ const UNMUTE_AUDIO: &str = "${./audio/discord-unmute.mp3}";
+
+ fn main() {
+ let mute_status = Command::new("${pamixerExe}")
+ .args(["--default-source", "--get-mute"])
+ .output()
+ .expect("Unable to get mute status from pamixer")
+ .stdout;
+
+ let mute_status = str::from_utf8(&mute_status[..]).expect("pamixer output wasn't a string").trim();
+
+ if mute_status == "false" {
+ Command::new("${pamixerExe}")
+ .args(["--default-source", "--mute"])
+ .output()
+ .expect("Unable to mute via pamixer");
+
+ Command::new("${mpvExe}")
+ .args(["--no-video", "--volume=80", MUTE_AUDIO])
+ .output()
+ .expect("Unable to play audio via mpv");
+ } else {
+ Command::new("${pamixerExe}")
+ .args(["--default-source", "--unmute"])
+ .output()
+ .expect("Unable to unmute via pamixer");
+
+ Command::new("${mpvExe}")
+ .args(["--no-video", "--volume=80", UNMUTE_AUDIO])
+ .output()
+ .expect("Unable to play audio via mpv");
+ }
+
+ let xrootdatetime_pid_raw =
+ Command::new("systemctl")
+ .args([
+ "--user",
+ "show",
+ "--property", "MainPID",
+ "--value", "xrootdatetime"
+ ])
+ .output();
+
+ if let Ok(xrootdatetime_pid_raw) = xrootdatetime_pid_raw {
+ if let Ok(xrootdatetime_pid) = str::from_utf8(&xrootdatetime_pid_raw.stdout[..]) {
+ let _ = Command::new("kill")
+ .args([
+ "-s",
+ "SIGUSR1",
+ xrootdatetime_pid
+ ])
+ .spawn();
+ }
+ }
+ }
+''