From cfff426c54f59c8b19a4f88e8fd7f2b1b75e60a7 Mon Sep 17 00:00:00 2001
From: Skyler Grey <minion@freshlybakedca.ke>
Date: Sat, 4 Oct 2025 19:23:58 +0000
Subject: [PATCH] style(*): move projects to projects/
Change-Id: xlvolxyvpqxskwxwyzzvkptkzvrspuuk

Most of this is fairly straightforward, there's just a couple of bits of
complication:
- We need to update packetmix to use the new clone URL
- The order filters are applied in really matters, we need to add the
  folders first before we then move out from the top of the workspace
- Our README also needs updating
---
 README.md                                        | 6 +++---
 packetmix/systems/common/packetmix.nix           | 1 +
 {packetmix => projects/packetmix}/workspace.josh | 1 +
 {sprinkles => projects/sprinkles}/workspace.josh | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename {packetmix => projects/packetmix}/workspace.josh (66%)
 rename {sprinkles => projects/sprinkles}/workspace.josh (50%)

diff --git a/README.md b/README.md
index d627e935..3b100f48 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,8 @@ provide a public [*josh* proxy](https://josh-project.github.io/josh/) which can
 be used to filter your clone:
 
 ```bash
-git clone https://git.freshlybakedca.ke/patisserie.git:workspace=packetmix.git packetmix
-# Swap out the "packetmix"es at the end of the command for whatever project you want to clone
+git clone https://git.freshlybakedca.ke/patisserie.git:workspace=projects/packetmix.git
+# Swap out the "packetmix" at the end of the command for whatever project you want to clone
 ```
 
 If you need to push then, as with *tangled* normally, you are required to use
@@ -47,7 +47,7 @@ When you've added this section to your ssh config, you can add a custom push URL
 to use SSH.
 
 ```bash
-git remote set-url --push ssh://git@git.freshlybakedca.ke/patisserie.git:workspace=packetmix.git
+git remote set-url --push ssh://git@git.freshlybakedca.ke/patisserie.git:workspace=projects/packetmix.git
 # Swap out "packetmix" at the end of the URL for whatever project you have cloned
 ```
 
diff --git a/packetmix/systems/common/packetmix.nix b/packetmix/systems/common/packetmix.nix
index d493f7fe..d53f4ae8 100644
--- a/packetmix/systems/common/packetmix.nix
+++ b/packetmix/systems/common/packetmix.nix
@@ -28,6 +28,7 @@
   systemd.services.nixos-upgrade.preStart = ''
     ${pkgs.networkmanager}/bin/nm-online -s -q # wait until the internet is online, as esp. if we go offline we need to wait to retry...
     cd /etc/nixos
+    ${pkgs.git}/bin/git remote set-url origin https://git.freshlybakedca.ke/patisserie.git:workspace=projects/packetmix.git
     ${pkgs.git}/bin/git fetch
     ${pkgs.git}/bin/git checkout origin/release
   '';
diff --git a/packetmix/workspace.josh b/projects/packetmix/workspace.josh
similarity index 66%
rename from packetmix/workspace.josh
rename to projects/packetmix/workspace.josh
index 2ebc803c..7206f3f7 100644
--- a/packetmix/workspace.josh
+++ b/projects/packetmix/workspace.josh
@@ -1,2 +1,3 @@
 ::.tangled/
 ::LICENSES/
+:/packetmix
diff --git a/sprinkles/workspace.josh b/projects/sprinkles/workspace.josh
similarity index 50%
rename from sprinkles/workspace.josh
rename to projects/sprinkles/workspace.josh
index a1b06c1c..a7831c97 100644
--- a/sprinkles/workspace.josh
+++ b/projects/sprinkles/workspace.josh
@@ -1 +1,2 @@
 ::LICENSES/
+:/sprinkles
-- 
2.43.0