15 files changed, 8 insertions, 8 deletions
diff --git a/hm/soispha/conf/yambar/default.nix b/hm/soispha/conf/yambar/default.nix
index abc0c85e..f732e1d8 100644
--- a/hm/soispha/conf/yambar/default.nix
+++ b/hm/soispha/conf/yambar/default.nix
@@ -8,16 +8,16 @@
   ...
 }: let
   makeScript = {
-    file,
+    name,
     dependencies,
     ...
   }:
     sysLib.writeShellScript {
-      name = "${builtins.baseNameOf file}";
-      src = file;
+      inherit name;
+      src = ./scripts/${name}.sh;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash;});
     }
-    + "/bin/${builtins.baseNameOf file}";
+    + "/bin/${name}";
 in {
   xdg.configFile."yambar/config.yml".source = pkgs.substituteAll {
     src =
@@ -32,12 +32,12 @@ in {
 
     mpd_song_name_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) mpc-cli;};
-      file = ./scripts/mpd_song_name;
+      name = "mpd_song_name";
     };
 
     volume_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) pulseaudio gawk coreutils;};
-      file = ./scripts/sound-volume;
+      name = "sound-volume";
     };
 
     # grade_average_script = makeScript {
@@ -46,7 +46,7 @@ in {
     #       grades.outputs.packages.${system}.default
     #     ]
     #     ++ (builtins.attrValues {inherit (pkgs) coreutils gawk;});
-    #   file = ./scripts/grades-average;
+    #   name = "grades-average";
     # };
 
     cpu_script = yambar_cpu.app.${system}.default.program;
@@ -55,7 +55,7 @@ in {
 
     disk_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) gawk btrfs-progs coreutils;};
-      file = ./scripts/disk;
+      name = "disk";
     };
   };
 }
diff --git a/hm/soispha/conf/yambar/scripts/disk b/hm/soispha/conf/yambar/scripts/disk.sh
index 003455ab..003455ab 100755
--- a/hm/soispha/conf/yambar/scripts/disk
+++ b/hm/soispha/conf/yambar/scripts/disk.sh
diff --git a/hm/soispha/conf/yambar/scripts/grades-average b/hm/soispha/conf/yambar/scripts/grades-average.sh
index 8c1900cf..8c1900cf 100755
--- a/hm/soispha/conf/yambar/scripts/grades-average
+++ b/hm/soispha/conf/yambar/scripts/grades-average.sh
diff --git a/hm/soispha/conf/yambar/scripts/mpd_song_name b/hm/soispha/conf/yambar/scripts/mpd_song_name.sh
index b778afbc..b778afbc 100755
--- a/hm/soispha/conf/yambar/scripts/mpd_song_name
+++ b/hm/soispha/conf/yambar/scripts/mpd_song_name.sh
diff --git a/hm/soispha/conf/yambar/scripts/network b/hm/soispha/conf/yambar/scripts/network.sh
index 717ea6be..717ea6be 100755
--- a/hm/soispha/conf/yambar/scripts/network
+++ b/hm/soispha/conf/yambar/scripts/network.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/amixer-monitor b/hm/soispha/conf/yambar/scripts/old/amixer-monitor.sh
index 9e75acfa..9e75acfa 100755
--- a/hm/soispha/conf/yambar/scripts/old/amixer-monitor
+++ b/hm/soispha/conf/yambar/scripts/old/amixer-monitor.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/cpu b/hm/soispha/conf/yambar/scripts/old/cpu.sh
index bae820d0..bae820d0 100755
--- a/hm/soispha/conf/yambar/scripts/old/cpu
+++ b/hm/soispha/conf/yambar/scripts/old/cpu.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/dfspace b/hm/soispha/conf/yambar/scripts/old/dfspace.sh
index 0b262481..0b262481 100755
--- a/hm/soispha/conf/yambar/scripts/old/dfspace
+++ b/hm/soispha/conf/yambar/scripts/old/dfspace.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/grades-average b/hm/soispha/conf/yambar/scripts/old/grades-average.sh
index a04b958c..a04b958c 100755
--- a/hm/soispha/conf/yambar/scripts/old/grades-average
+++ b/hm/soispha/conf/yambar/scripts/old/grades-average.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/meminfo b/hm/soispha/conf/yambar/scripts/old/meminfo.sh
index 0156e94c..0156e94c 100755
--- a/hm/soispha/conf/yambar/scripts/old/meminfo
+++ b/hm/soispha/conf/yambar/scripts/old/meminfo.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/nmclitest b/hm/soispha/conf/yambar/scripts/old/nmclitest.sh
index 3e8bc73a..3e8bc73a 100755
--- a/hm/soispha/conf/yambar/scripts/old/nmclitest
+++ b/hm/soispha/conf/yambar/scripts/old/nmclitest.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/pingtest b/hm/soispha/conf/yambar/scripts/old/pingtest.sh
index 2b5f9998..2b5f9998 100755
--- a/hm/soispha/conf/yambar/scripts/old/pingtest
+++ b/hm/soispha/conf/yambar/scripts/old/pingtest.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/yambar-tray-width b/hm/soispha/conf/yambar/scripts/old/yambar-tray-width.sh
index 00544e70..00544e70 100755
--- a/hm/soispha/conf/yambar/scripts/old/yambar-tray-width
+++ b/hm/soispha/conf/yambar/scripts/old/yambar-tray-width.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/yambar-tray b/hm/soispha/conf/yambar/scripts/old/yambar-tray.sh
index 1704c6dd..1704c6dd 100755
--- a/hm/soispha/conf/yambar/scripts/old/yambar-tray
+++ b/hm/soispha/conf/yambar/scripts/old/yambar-tray.sh
diff --git a/hm/soispha/conf/yambar/scripts/sound-volume b/hm/soispha/conf/yambar/scripts/sound-volume.sh
index 721d51bf..721d51bf 100755
--- a/hm/soispha/conf/yambar/scripts/sound-volume
+++ b/hm/soispha/conf/yambar/scripts/sound-volume.sh