refactor: remove unused sane-private-* scripts or move them into scripts/

hosts/common/programs/sane-scripts.nix

@@ -21,9 +21,6 @@ in
       "sane-scripts.find-dotfiles"
       "sane-scripts.ip-check"
       "sane-scripts.private-do"
-      "sane-scripts.private-init"
-      "sane-scripts.private-lock"
-      "sane-scripts.private-unlock"
       "sane-scripts.rcp"
       "sane-scripts.reboot"
       "sane-scripts.reclaim-boot-space"
@@ -117,15 +114,6 @@ in
       net = "all";
       extraPaths = [ "/" ];
     };
-    "sane-scripts.private-init".sandbox = {
-      method = "bwrap";
-      capabilities = [ "sys_admin" ];  # it needs to mount the new store
-      extraHomePaths = [
-        ".persist/private"
-      ];
-    };
-    "sane-scripts.private-lock".sandbox.method = null;
-    "sane-scripts.private-unlock".sandbox.method = null;
 
     "sane-scripts.reclaim-boot-space".sandbox = {
       method = "bunpen";

pkgs/by-name/sane-scripts/package.nix

@@ -113,21 +113,6 @@ let
       srcRoot = ./src;
       pkgs = [ "util-linux" ];
     };
-    private-init = static-nix-shell.mkBash {
-      pname = "sane-private-init";
-      srcRoot = ./src;
-      pkgs = [ "gocryptfs" ];
-    };
-    private-lock = static-nix-shell.mkBash {
-      pname = "sane-private-lock";
-      srcRoot = ./src;
-      pkgs = [ "util-linux.mount" ];
-    };
-    private-unlock = static-nix-shell.mkBash {
-      pname = "sane-private-unlock";
-      srcRoot = ./src;
-      pkgs = [ "util-linux.mount" ];
-    };
     private-unlock-remote = static-nix-shell.mkBash {
       pname = "sane-private-unlock-remote";
       srcRoot = ./src;

pkgs/by-name/sane-scripts/src/sane-private-lock

@@ -1,4 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash -p util-linux.mount
-
-umount /mnt/persist/private

pkgs/by-name/sane-scripts/src/sane-private-unlock

@@ -1,7 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash -p util-linux.mount
-
-# TODO: the mountpoint isn't created as part of startup: why?
-sudo mkdir -p /mnt/persist/private
-sudo chown colin:users /mmt/persist/private
-mount /mnt/persist/private

scripts/bringup/init-persist-private

@@ -1,10 +1,11 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p bash -p gocryptfs
 
-set -ex
-
 # configure persistent, encrypted storage that is auto-mounted on login.
 # this is a one-time setup and user should log out/back in after running it.
+
+set -ex
+
 p=/nix/persist/private
 
 if ! test -d "$p" || ! test -w "$p"; then