From ed16562d587067ebddc2b11246ddadec8eee5dc1 Mon Sep 17 00:00:00 2001
From: pagedMov <pagedMov@gmail.com>
Date: Sat, 12 Oct 2024 17:29:04 -0400
Subject: [PATCH] Gen 423: Updated shell script nix files to point to sound
 files in the root directory

---
 glasshouse-laptop/home/scripts/compress.nix        | 2 +-
 glasshouse-laptop/home/scripts/crs.nix             | 2 +-
 glasshouse-laptop/home/scripts/extract.nix         | 2 +-
 glasshouse-laptop/home/scripts/garbage-collect.nix | 2 +-
 glasshouse-laptop/home/scripts/homep.nix           | 2 +-
 glasshouse-laptop/home/scripts/homer.nix           | 2 +-
 glasshouse-laptop/home/scripts/invoke.nix          | 2 +-
 glasshouse-laptop/home/scripts/keybinds.nix        | 2 +-
 glasshouse-laptop/home/scripts/lofi.nix            | 2 +-
 glasshouse-laptop/home/scripts/maxfetch.nix        | 2 +-
 glasshouse-laptop/home/scripts/mcd.nix             | 2 +-
 glasshouse-laptop/home/scripts/music.nix           | 2 +-
 glasshouse-laptop/home/scripts/nixcommit.nix       | 8 ++++----
 glasshouse-laptop/home/scripts/nixp.nix            | 2 +-
 glasshouse-laptop/home/scripts/nixr.nix            | 2 +-
 glasshouse-laptop/home/scripts/nixswitch.nix       | 8 ++++----
 glasshouse-laptop/home/scripts/nsp.nix             | 2 +-
 glasshouse-laptop/home/scripts/power-menu.nix      | 2 +-
 glasshouse-laptop/home/scripts/record.nix          | 2 +-
 glasshouse-laptop/home/scripts/runbg.nix           | 2 +-
 glasshouse-laptop/home/scripts/s_check.nix         | 2 +-
 glasshouse-laptop/home/scripts/shutdown-script.nix | 2 +-
 glasshouse-laptop/home/scripts/splash.nix          | 2 +-
 glasshouse-laptop/home/scripts/switchmon.nix       | 2 +-
 glasshouse-laptop/home/scripts/toggle_blur.nix     | 2 +-
 glasshouse-laptop/home/scripts/toggle_float.nix    | 2 +-
 glasshouse-laptop/home/scripts/toggle_oppacity.nix | 2 +-
 glasshouse-laptop/home/scripts/toggle_waybar.nix   | 2 +-
 28 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/glasshouse-laptop/home/scripts/compress.nix b/glasshouse-laptop/home/scripts/compress.nix
index 3aab173..5dbaf5f 100644
--- a/glasshouse-laptop/home/scripts/compress.nix
+++ b/glasshouse-laptop/home/scripts/compress.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	compress = pkgs.writeShellScriptBin "compress" (''
diff --git a/glasshouse-laptop/home/scripts/crs.nix b/glasshouse-laptop/home/scripts/crs.nix
index fcc252a..a800101 100644
--- a/glasshouse-laptop/home/scripts/crs.nix
+++ b/glasshouse-laptop/home/scripts/crs.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	crs = pkgs.writeShellScriptBin "crs" (''
diff --git a/glasshouse-laptop/home/scripts/extract.nix b/glasshouse-laptop/home/scripts/extract.nix
index 0a02265..d30efe2 100644
--- a/glasshouse-laptop/home/scripts/extract.nix
+++ b/glasshouse-laptop/home/scripts/extract.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	extract = pkgs.writeShellScriptBin "extract" (''
diff --git a/glasshouse-laptop/home/scripts/garbage-collect.nix b/glasshouse-laptop/home/scripts/garbage-collect.nix
index f8f2889..17edd4b 100644
--- a/glasshouse-laptop/home/scripts/garbage-collect.nix
+++ b/glasshouse-laptop/home/scripts/garbage-collect.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	garbage-collect = pkgs.writeShellScriptBin "garbage-collect" (''
diff --git a/glasshouse-laptop/home/scripts/homep.nix b/glasshouse-laptop/home/scripts/homep.nix
index 4e4dd0a..2e27f42 100644
--- a/glasshouse-laptop/home/scripts/homep.nix
+++ b/glasshouse-laptop/home/scripts/homep.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	homep = pkgs.writeShellScriptBin "homep" (''
diff --git a/glasshouse-laptop/home/scripts/homer.nix b/glasshouse-laptop/home/scripts/homer.nix
index 9f2b26c..35abaa9 100644
--- a/glasshouse-laptop/home/scripts/homer.nix
+++ b/glasshouse-laptop/home/scripts/homer.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	homer = pkgs.writeShellScriptBin "homer" (''
diff --git a/glasshouse-laptop/home/scripts/invoke.nix b/glasshouse-laptop/home/scripts/invoke.nix
index 818dc77..872ae9a 100644
--- a/glasshouse-laptop/home/scripts/invoke.nix
+++ b/glasshouse-laptop/home/scripts/invoke.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	invoke = pkgs.writeShellScriptBin "invoke" (''
diff --git a/glasshouse-laptop/home/scripts/keybinds.nix b/glasshouse-laptop/home/scripts/keybinds.nix
index fb3c20b..9225351 100644
--- a/glasshouse-laptop/home/scripts/keybinds.nix
+++ b/glasshouse-laptop/home/scripts/keybinds.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	keybinds = pkgs.writeShellScriptBin "keybinds" (''
diff --git a/glasshouse-laptop/home/scripts/lofi.nix b/glasshouse-laptop/home/scripts/lofi.nix
index 4784619..7bb1050 100644
--- a/glasshouse-laptop/home/scripts/lofi.nix
+++ b/glasshouse-laptop/home/scripts/lofi.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	lofi = pkgs.writeShellScriptBin "lofi" (''
diff --git a/glasshouse-laptop/home/scripts/maxfetch.nix b/glasshouse-laptop/home/scripts/maxfetch.nix
index 11f0278..d3b8069 100644
--- a/glasshouse-laptop/home/scripts/maxfetch.nix
+++ b/glasshouse-laptop/home/scripts/maxfetch.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	maxfetch = pkgs.writeShellScriptBin "maxfetch" (''
diff --git a/glasshouse-laptop/home/scripts/mcd.nix b/glasshouse-laptop/home/scripts/mcd.nix
index 718dbf2..78bf53e 100644
--- a/glasshouse-laptop/home/scripts/mcd.nix
+++ b/glasshouse-laptop/home/scripts/mcd.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	mcd = pkgs.writeShellScriptBin "mcd" (''
diff --git a/glasshouse-laptop/home/scripts/music.nix b/glasshouse-laptop/home/scripts/music.nix
index c2f26d2..0063bfb 100644
--- a/glasshouse-laptop/home/scripts/music.nix
+++ b/glasshouse-laptop/home/scripts/music.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	music = pkgs.writeShellScriptBin "music" (''
diff --git a/glasshouse-laptop/home/scripts/nixcommit.nix b/glasshouse-laptop/home/scripts/nixcommit.nix
index 65cc850..2e52811 100644
--- a/glasshouse-laptop/home/scripts/nixcommit.nix
+++ b/glasshouse-laptop/home/scripts/nixcommit.nix
@@ -1,10 +1,10 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	nixcommit = pkgs.writeShellScriptBin "nixcommit" (''
 #!/run/current-system/sw/bin/bash
 
-scheck && runbg aplay ~/media/sound/sys/nixswitch-start.wav
+scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav
 builtin cd "$HOME/sysflakes" || exit
 nix flake update
 if [ -n "$2" ]; then
@@ -17,14 +17,14 @@ gen=$((gen + 1))
 
 diffcheck=$(git status | grep "working tree clean")
 if [ -n "$diffcheck" ]; then
-	scheck && runbg aplay ~/media/sound/sys/warning.wav
+	scheck && runbg aplay ${self}/media/sound/warning.wav
 	echo "Nothing to commit"
 	exit
 fi
 git add .
 git commit -m "Gen $gen: $1"
 git push
-scheck && runbg aplay ~/media/sound/sys/gitpush.wav
+scheck && runbg aplay ${self}/media/sound/gitpush.wav
 builtin cd - || exit
 	'');
 }
diff --git a/glasshouse-laptop/home/scripts/nixp.nix b/glasshouse-laptop/home/scripts/nixp.nix
index 7c65cde..f30b886 100644
--- a/glasshouse-laptop/home/scripts/nixp.nix
+++ b/glasshouse-laptop/home/scripts/nixp.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	nixp = pkgs.writeShellScriptBin "nixp" (''
diff --git a/glasshouse-laptop/home/scripts/nixr.nix b/glasshouse-laptop/home/scripts/nixr.nix
index 2345757..2d967ea 100644
--- a/glasshouse-laptop/home/scripts/nixr.nix
+++ b/glasshouse-laptop/home/scripts/nixr.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	nixr = pkgs.writeShellScriptBin "nixr" (''
diff --git a/glasshouse-laptop/home/scripts/nixswitch.nix b/glasshouse-laptop/home/scripts/nixswitch.nix
index cd4fe14..539eb83 100644
--- a/glasshouse-laptop/home/scripts/nixswitch.nix
+++ b/glasshouse-laptop/home/scripts/nixswitch.nix
@@ -1,18 +1,18 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	nixswitch = pkgs.writeShellScriptBin "nixswitch" (''
 #!/run/current-system/sw/bin/bash
 
-scheck && runbg aplay ~/media/sound/sys/nixswitch-start.wav
+scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav
 builtin cd "$HOME/sysflakes" || exit
 
 nix flake update
 sudo nixos-rebuild switch --flake "$HOME/sysflakes#glasshouse-laptop"
 if [ $? -eq 0 ]; then 
-	scheck && runbg aplay ~/media/sound/sys/update.wav
+	scheck && runbg aplay ${self}/media/sound/update.wav
 else
-	scheck && runbg aplay ~/media/sound/sys/error.wav
+	scheck && runbg aplay ${self}/media/sound/error.wav
 fi
 builtin cd "$OLDPWD" || exit
 	'');
diff --git a/glasshouse-laptop/home/scripts/nsp.nix b/glasshouse-laptop/home/scripts/nsp.nix
index 5c2e968..d69c395 100644
--- a/glasshouse-laptop/home/scripts/nsp.nix
+++ b/glasshouse-laptop/home/scripts/nsp.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	nsp = pkgs.writeShellScriptBin "nsp" (''
diff --git a/glasshouse-laptop/home/scripts/power-menu.nix b/glasshouse-laptop/home/scripts/power-menu.nix
index 231ea58..989d6fe 100644
--- a/glasshouse-laptop/home/scripts/power-menu.nix
+++ b/glasshouse-laptop/home/scripts/power-menu.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	power-menu = pkgs.writeShellScriptBin "power-menu" (''
diff --git a/glasshouse-laptop/home/scripts/record.nix b/glasshouse-laptop/home/scripts/record.nix
index 86ef3ee..cbc9fa5 100644
--- a/glasshouse-laptop/home/scripts/record.nix
+++ b/glasshouse-laptop/home/scripts/record.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	record = pkgs.writeShellScriptBin "record" (''
diff --git a/glasshouse-laptop/home/scripts/runbg.nix b/glasshouse-laptop/home/scripts/runbg.nix
index 7d2c13f..ab40214 100644
--- a/glasshouse-laptop/home/scripts/runbg.nix
+++ b/glasshouse-laptop/home/scripts/runbg.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	runbg = pkgs.writeShellScriptBin "runbg" (''
diff --git a/glasshouse-laptop/home/scripts/s_check.nix b/glasshouse-laptop/home/scripts/s_check.nix
index 13717ab..3f33b6f 100644
--- a/glasshouse-laptop/home/scripts/s_check.nix
+++ b/glasshouse-laptop/home/scripts/s_check.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	s_check = pkgs.writeShellScriptBin "s_check" (''
diff --git a/glasshouse-laptop/home/scripts/shutdown-script.nix b/glasshouse-laptop/home/scripts/shutdown-script.nix
index e1efb1e..e3d8d52 100644
--- a/glasshouse-laptop/home/scripts/shutdown-script.nix
+++ b/glasshouse-laptop/home/scripts/shutdown-script.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	shutdown-script = pkgs.writeShellScriptBin "shutdown-script" (''
diff --git a/glasshouse-laptop/home/scripts/splash.nix b/glasshouse-laptop/home/scripts/splash.nix
index fb8cad8..ef1f879 100644
--- a/glasshouse-laptop/home/scripts/splash.nix
+++ b/glasshouse-laptop/home/scripts/splash.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	splash = pkgs.writeShellScriptBin "splash" (''
diff --git a/glasshouse-laptop/home/scripts/switchmon.nix b/glasshouse-laptop/home/scripts/switchmon.nix
index 2ea44b8..267826a 100644
--- a/glasshouse-laptop/home/scripts/switchmon.nix
+++ b/glasshouse-laptop/home/scripts/switchmon.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	switchmon = pkgs.writeShellScriptBin "switchmon" (''
diff --git a/glasshouse-laptop/home/scripts/toggle_blur.nix b/glasshouse-laptop/home/scripts/toggle_blur.nix
index 91bb051..3490036 100644
--- a/glasshouse-laptop/home/scripts/toggle_blur.nix
+++ b/glasshouse-laptop/home/scripts/toggle_blur.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	toggle_blur = pkgs.writeShellScriptBin "toggle_blur" (''
diff --git a/glasshouse-laptop/home/scripts/toggle_float.nix b/glasshouse-laptop/home/scripts/toggle_float.nix
index dff1198..29b8fca 100644
--- a/glasshouse-laptop/home/scripts/toggle_float.nix
+++ b/glasshouse-laptop/home/scripts/toggle_float.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	toggle_float = pkgs.writeShellScriptBin "toggle_float" (''
diff --git a/glasshouse-laptop/home/scripts/toggle_oppacity.nix b/glasshouse-laptop/home/scripts/toggle_oppacity.nix
index 9d075f2..4d7a71e 100644
--- a/glasshouse-laptop/home/scripts/toggle_oppacity.nix
+++ b/glasshouse-laptop/home/scripts/toggle_oppacity.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	toggle_oppacity = pkgs.writeShellScriptBin "toggle_oppacity" (''
diff --git a/glasshouse-laptop/home/scripts/toggle_waybar.nix b/glasshouse-laptop/home/scripts/toggle_waybar.nix
index 3ad7b58..40e420e 100644
--- a/glasshouse-laptop/home/scripts/toggle_waybar.nix
+++ b/glasshouse-laptop/home/scripts/toggle_waybar.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 
 {
 	toggle_waybar = pkgs.writeShellScriptBin "toggle_waybar" (''