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

config/fastfetch/config.jsonc

@@ -24,7 +24,7 @@
 		},
 		{
 			"type": "kernel",
-			"format": "Linux 6.17.0-2-cachyos-ralsei-rt-bore-lto",
+			// "format": "Linux 6.17.0-2-cachyos-ralsei-rt-bore-lto"
 		},
 		// "packages",
 

config/qt5ct/qt5ct.conf

@@ -1,9 +1,9 @@
 [Appearance]
-color_scheme_path=/home/ocbwoy3/.config/qt5ct/colors/catppuccin-mocha-blue.conf
+color_scheme_path=/home/ralsei/.config/qt5ct/colors/catppuccin-mocha-blue.conf
 custom_palette=true
 icon_theme=Arashi
 standard_dialogs=default
-style=Windows
+style=Fusion
 
 [Fonts]
 fixed="Geist Mono,9,-1,5,50,0,0,0,0,0"
@@ -25,7 +25,7 @@ underline_shortcut=1
 wheel_scroll_lines=3
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x16\0\0\0\x36\0\0\x3\xb8\0\0\x4!\0\0\0\x16\0\0\0\x36\0\0\x3\xb8\0\0\x4!\0\0\0\0\0\0\0\0\a\x80\0\0\0\x16\0\0\0\x36\0\0\x3\xb8\0\0\x4!)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x16\0\0\0\x33\0\0\x3\xb8\0\0\x4!\0\0\0\x16\0\0\0\x33\0\0\x3\xb8\0\0\x4!\0\0\0\0\0\0\0\0\a\x80\0\0\0\x16\0\0\0\x33\0\0\x3\xb8\0\0\x4!)
 
 [Troubleshooting]
 force_raster_widgets=1

config/wlogout/layout

@@ -1,6 +1,6 @@
 {
     "label" : "lock",
-    "action" : "loginctl lock-session",
+    "action" : "hyprctl dispatch exec hyprlock",
     "text" : "Lock",
     "keybind" : "l"
 }
@@ -12,7 +12,7 @@
 }
 {
     "label" : "logout",
-    "action" : "loginctl terminate-user $USER",
+    "action" : "pkill -9 -u ralsei",
     "text" : "Logout",
     "keybind" : "e"
 }

config/wlogout/style.css

@@ -35,27 +35,37 @@ button:hover {
 }
 
 #lock {
-	background-image: image(url("~/config/config/wlogout/assets/lock.png"));
+	background-image: image(
+		url("/home/ralsei/config/config/wlogout/assets/lock.png")
+	);
 }
 
 #logout {
-	background-image: image(url("~/config/config/wlogout/assets/logout.png"));
+	background-image: image(
+		url("/home/ralsei/config/config/wlogout/assets/logout.png")
+	);
 }
 
 #suspend {
-	background-image: image(url("~/config/config/wlogout/assets/suspend.png"));
+	background-image: image(
+		url("/home/ralsei/config/config/wlogout/assets/suspend.png")
+	);
 }
 
 #hibernate {
 	background-image: image(
-		url("~/config/config/wlogout/assets/hibernate.png")
+		url("/home/ralsei/config/config/wlogout/assets/hibernate.png")
 	);
 }
 
 #shutdown {
-	background-image: image(url("~/config/config/wlogout/assets/shutdown.png"));
+	background-image: image(
+		url("/home/ralsei/config/config/wlogout/assets/shutdown.png")
+	);
 }
 
 #reboot {
-	background-image: image(url("~/config/config/wlogout/assets/reboot.png"));
+	background-image: image(
+		url("/home/ralsei/config/config/wlogout/assets/reboot.png")
+	);
 }

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
 };