scripts: move these to more appropriate places

README.md

@@ -37,9 +37,7 @@ directly here; even the sources for those packages is often kept here too.
     - inline code for wholly custom packages (e.g. `pkgs/additional/sane-scripts/` for CLI tools
       that are highly specific to my setup).
 - `scripts/`
-    - scripts which are referenced by other things in this repo.
-    - these aren't generally user-facing, but they're factored out so that they can
-      be invoked directly when i need to debug.
+    - scripts which aren't reachable on a deployed system, but may aid manual deployments
 - `secrets/`
     - encrypted keys, API tokens, anything which one or more of my machines needs
       read access to but shouldn't be world-readable.

hosts/common/home/default.nix

@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./keyring.nix
+    ./keyring
     ./mime.nix
     ./ssh.nix
     ./xdg-dirs.nix

hosts/common/home/keyring/default.nix

@@ -4,7 +4,7 @@
   sane.user.persist.private = [ ".local/share/keyrings" ];
 
   sane.user.fs."private/.local/share/keyrings/default" = {
-    generated.script.script = builtins.readFile ../../../scripts/init-keyring;
+    generated.script.script = builtins.readFile ./init-keyring;
     # TODO: is this `wantedBy` needed? can we inherit it?
     wantedBy = [ config.sane.fs."/home/colin/private".unit ];
     wantedBeforeBy = [ ];  # don't created this as part of `multi-user.target`

hosts/modules/roles/client/bluetooth-pairings.nix

@@ -3,7 +3,7 @@
 let
   install-bluetooth = pkgs.static-nix-shell.mkBash {
     pname = "install-bluetooth";
-    src = ../../../../scripts;
+    src = ./.;
     pkgs = [ "gnused" ];
   };
 in

hosts/modules/roles/client/wifi-pairings.nix

@@ -3,7 +3,7 @@
 let
   install-iwd = pkgs.static-nix-shell.mkBash {
     pname = "install-iwd";
-    src = ../../../../scripts;
+    src = ./.;
     pkgs = [ "gnused" ];
   };
 in