From cc09b607330385d6d81b9c47cf64a2442432e93f Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Tue, 20 Feb 2024 16:35:15 +0100
Subject: refactor(treewide): Add a `.sh` extension to shell scripts

---
 hm/soispha/conf/yambar/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'hm/soispha/conf/yambar/default.nix')

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";
     };
   };
 }
-- 
cgit 1.4.1