2 files changed, 27 insertions, 49 deletions
diff --git a/hm/soispha/pkgs/default.nix b/hm/soispha/pkgs/default.nix
index 0d134db2..a76740b6 100644
--- a/hm/soispha/pkgs/default.nix
+++ b/hm/soispha/pkgs/default.nix
@@ -44,31 +44,7 @@ with pkgs; let
   };
 
   TuiCli = {
-    ShellScripts = [
-      aumo
-      battery
-      con2pdf
-      description
-      fupdate
-      git-edit-index
-      hibernate
-      ll
-      lock
-      lyrics
-      mpc-fav
-      mpc-rm
-      mpc
-      nato
-      neorg
-      screenshot_persistent
-      screenshot_temporary
-      show
-      sort_song
-      spodi
-      update-sys
-      virsh-del
-      yti
-    ];
+    ShellScripts = builtins.attrValues pkgs.scripts;
 
     EyeCandy = [
       #banner # Print large banners to ASCII terminals
diff --git a/sys/nixpkgs/pkgs/scripts/default.nix b/sys/nixpkgs/pkgs/scripts/default.nix
index faa546c7..b0323472 100644
--- a/sys/nixpkgs/pkgs/scripts/default.nix
+++ b/sys/nixpkgs/pkgs/scripts/default.nix
@@ -321,30 +321,32 @@
         dependencies = builtins.attrValues {inherit (prev) gawk expect yt-dlp;};
       };
     in {
-      # llp = llp-scr; # TODO: see above
-      aumo = aumo-scr;
-      battery = battery-scr;
-      con2pdf = con2pdf-scr;
-      description = description-scr;
-      fupdate = fupdate-scr;
-      git-edit-index = git-edit-index-scr;
-      hibernate = hibernate-scr;
-      ll = ll-scr;
-      lock = lock-scr;
-      lyrics = lyrics-scr;
-      mpc-fav = mpc-fav-scr;
-      mpc-rm = mpc-rm-scr;
-      mpc = mpc-scr;
-      nato = nato-scr;
-      neorg = neorg-scr;
-      screenshot_persistent = screenshot_persistent-scr;
-      screenshot_temporary = screenshot_temporary-scr;
-      show = show-scr;
-      sort_song = sort_song-scr;
-      spodi = spodi-scr;
-      update-sys = update-sys-scr;
-      virsh-del = virsh-del-scr;
-      yti = yti-scr;
+      scripts = {
+        # llp = llp-scr; # TODO: see above
+        aumo = aumo-scr;
+        battery = battery-scr;
+        con2pdf = con2pdf-scr;
+        description = description-scr;
+        fupdate = fupdate-scr;
+        git-edit-index = git-edit-index-scr;
+        hibernate = hibernate-scr;
+        ll = ll-scr;
+        lock = lock-scr;
+        lyrics = lyrics-scr;
+        mpc-fav = mpc-fav-scr;
+        mpc-rm = mpc-rm-scr;
+        mpc = mpc-scr;
+        nato = nato-scr;
+        neorg = neorg-scr;
+        screenshot_persistent = screenshot_persistent-scr;
+        screenshot_temporary = screenshot_temporary-scr;
+        show = show-scr;
+        sort_song = sort_song-scr;
+        spodi = spodi-scr;
+        update-sys = update-sys-scr;
+        virsh-del = virsh-del-scr;
+        yti = yti-scr;
+      };
     }
   )
 ]