From c542e120ef3e73de7194465b03a131352788486d Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 6 Jun 2023 08:15:16 +0000
Subject: [PATCH] refactor: sane-scripts: order the non-resholve scripts,
 rename `py-scripts`

---
 pkgs/additional/sane-scripts/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/additional/sane-scripts/default.nix b/pkgs/additional/sane-scripts/default.nix
index 371ec038..983a6a2e 100644
--- a/pkgs/additional/sane-scripts/default.nix
+++ b/pkgs/additional/sane-scripts/default.nix
@@ -38,7 +38,7 @@ let
           oath-toolkit
           openssh
           openssl
-          py-scripts.ip-check
+          nix-shell-scripts.ip-check
           rmlint
           rsync
           ssh-to-age
@@ -91,7 +91,7 @@ let
       let
         rmPy = builtins.concatStringsSep
           "\n"
-          (lib.mapAttrsToList (name: pkg: "rm ${pkg.pname}") py-scripts)
+          (lib.mapAttrsToList (name: pkg: "rm ${pkg.pname}") nix-shell-scripts)
         ;
       in ''
         # remove python library files, and python binaries  (those are packaged further below)
@@ -105,7 +105,7 @@ let
     '';
   };
 
-  py-scripts = {
+  nix-shell-scripts = {
     # anything added to this attrset gets symlink-joined into `sane-scripts`
     backup-ls = static-nix-shell.mkBash {
       pname = "sane-backup-ls";
@@ -180,19 +180,19 @@ let
         cp -R lib/* $out/bin/lib/
       '';
     };
-    reclaim-boot-space = static-nix-shell.mkPython3Bin {
-      pname = "sane-reclaim-boot-space";
-      src = ./src;
-    };
     ip-reconnect = static-nix-shell.mkPython3Bin {
       pname = "sane-ip-reconnect";
       src = ./src;
     };
+    reclaim-boot-space = static-nix-shell.mkPython3Bin {
+      pname = "sane-reclaim-boot-space";
+      src = ./src;
+    };
   };
 in
 symlinkJoin {
   name = "sane-scripts";
-  paths = [ shell-scripts ] ++ lib.attrValues py-scripts;
+  paths = [ shell-scripts ] ++ lib.attrValues nix-shell-scripts;
   meta = {
     description = "collection of scripts associated with uninsane systems";
     homepage = "https://git.uninsane.org";