Merge branch 'main' of tangled.sh:ocbwoy3.dev/nix

scripts/bin/actWithMusic.ts

@@ -3,20 +3,38 @@ import { albumStuffF, fetchAlbumStuff } from "../lib/CiderV2Playing";
 import { execFile } from "child_process";
 import { rmSync } from "fs";
 
+const isKDE = process.env.XDG_CURRENT_DESKTOP === "KDE" ? true : false;
+
 let x: albumStuffF | any = false;
 try {
 	x = (await fetchAlbumStuff()) as albumStuffF;
 } catch {}
 
+let releaseMode = process.argv[3] === "rel";
+// console.log(process.argv[3],isKDE,releaseMode);
+
 function notifyWithImage(
 	song: string,
 	artUrl: string,
 	artist: string,
 	album: string,
 ) {
+	if (isKDE === true) {
+		execFile("notify-send", [
+			"-t",
+			releaseMode ? "10" : "2000",
+			"-a",
+			"Now Playing",
+			"-i",
+			artUrl,
+			song,
+			`${artist}`, //<br/>${album !== "" ? `<small>${album}</small>` : ""}`
+		]);
+		return;
+	}
 	execFile("dunstify", [
 		"-t",
-		process.argv[3] === "rel" ? "1" : "2000",
+		releaseMode ? "1" : "2000",
 		"-r",
 		"67676767",
 		"-a",
@@ -28,12 +46,21 @@ function notifyWithImage(
 	]);
 }
 
-console.log(process.argv[3]);
-
 function notifyBasic(song: string, artist: string, album: string) {
+	if (isKDE === true) {
+		execFile("notify-send", [
+			"-t",
+			releaseMode ? "1" : "2000",
+			"-a",
+			"Now Playing",
+			song,
+			`${artist}`, //<br/>${album !== "" ? `<small>${album}</small>` : ""}`
+		]);
+		return;
+	}
 	execFile("dunstify", [
 		"-t",
-		process.argv[3] === "rel" ? "1" : "2000",
+		releaseMode ? "1" : "2000",
 		"-r",
 		"67676767",
 		"-a",

scripts/bin/handleScreenshot.ts

@@ -50,6 +50,7 @@ import { getRegretevatorState } from "../lib/RegretevatorUtil";
 
 const windowClassFriendyName: { [windowClass: string]: string } = {
 	steam_app_1671210: "Deltarune",
+	"deltarune.exe": "Deltarune", // deltarune with proton-cachyos/proton-cachyos-slr + PROTON_ENABLE_WAYLAND=1
 	"org.vinegarhq.Sober": "Roblox",
 	steam_app_1690940: "Deltarune", // demo
 };