updates, piped frontend switched to pnpm not yarn, fixed scripts

extras/mk-enc-usb.nix

@@ -5,7 +5,7 @@
   cryptsetup,
   e2fsprogs,
 }: let
-  usb_data = import ../hosts/lappy/hardware/usb_data.nix {};
+  usb_data = import ../data/usb_data.nix {};
 in
   stdenv.mkDerivation {
     name = "mk-enc-usb";

extras/mk-normal-enc-ssd.nix

@@ -6,7 +6,7 @@
   e2fsprogs,
   dosfstools,
 }: let
-  ssd_data = import ../hosts/normal-enc/hardware/ssd_data.nix {};
+  ssd_data = import ../data/normal_drive_data.nix {};
 in
   stdenv.mkDerivation {
     name = "mk-normal-enc-ssd";

flake.lock

@@ -47,11 +47,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1687709756,
+        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686778999,
-        "narHash": "sha256-3qBtOJdznerw33LgwJTSUL6u8/j1Ot83fcc0f6oHKmk=",
+        "lastModified": 1688218897,
+        "narHash": "sha256-qIBOgrUoQjWzbzC/SOQDGQHnyNkFPGnV3FWOgGKYNGY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e0034971f9def16bbc32124147787bc0f09f0e59",
+        "rev": "7a0e9a67824aa05f972459aefc2caafe6fdc0f88",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1686592866,
-        "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
+        "lastModified": 1688049487,
+        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
+        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1686807758,
-        "narHash": "sha256-0Kg2VqEZzrwZubTrtj+fu77F/IftkDH6ZESwe4ZXkfw=",
+        "lastModified": 1688217966,
+        "narHash": "sha256-79TZUKNEdJORiPe77wmCd9zd5SITpw7xcDmGRKhQQfY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "53bdfe0d57ba919516d99906d18db3a6f96b53f2",
+        "rev": "6b5b11e0557dee1a174eaaa6571b460c651cccad",
         "type": "github"
       },
       "original": {

home/base/zsh.nix

@@ -4,7 +4,7 @@ in {
   home.packages = with pkgs; [exa bat ripgrep vault age];
   programs.zsh = {
     enable = true;
-    enableSyntaxHighlighting = true;
+    syntaxHighlighting.enable = true;
     enableAutosuggestions = true;
     oh-my-zsh = {
       enable = true;

overlay/piped/backend/deps.nix

@@ -56,5 +56,5 @@ in
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "sha256-KhvijeYTkXSRMQm9r4emxhr2oGvsqJ9Fjqnz41qwtFk=";
+    outputHash = "sha256-qTwBcpCjD+4Ejhp6V55wGnCBaKImEaK/L0zFxNkp19o=";
   }

overlay/piped/frontend/default.nix

@@ -19,7 +19,7 @@ in
     };
 
     packageJSON = "${src}/package.json";
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = ./yarn.lock;
     yarnNix = ./yarn.nix;
 
     patchPhase = ''
@@ -35,6 +35,7 @@ in
 
     buildPhase = ''
       runHook preBuild
+      cp ${./yarn.lock} yarn.lock
       yarn --offline build
       runHook postBuild
     '';

overlay/piped/meta.json

@@ -1,14 +1,14 @@
 {
   "frontend": {
-    "rev": "6f060151f21e087fe5c5aacf6527237fd713362e",
-    "sha256": "sha256-rYy1b+9uOqCVuKaSnt4aV286vvMR9xs4T7uzl49GdL8="
+    "rev": "8df66abb0202372ef9b3e58b778586f709764e87",
+    "sha256": "sha256-xU4FxmMbt2T2s2J8fc86cUMup/wSI53F4VEqrb4O6L8="
   },
   "backend": {
-    "rev": "a694e8d9d3344417b4e177f93da54fb9368a83a6",
-    "sha256": "sha256-4FrnGZquD3ufuoP89BK/XqFBS0adiQLM4gB5n1Wruv0="
+    "rev": "93a5b8478e7783a7fbf697e405de943212cf6aa2",
+    "sha256": "sha256-BdBSWNXt6Q+xwGezk0E51cu2V24Pp/64HslyDegvN4k="
   },
   "proxy": {
-    "rev": "8c2797110bf21c641004690499d9cd59bc6a1190",
-    "sha256": "sha256-VkG5sHcKzIudY8LQpBKXYLj+6v8r6Lj01tlVw8u0sTk="
+    "rev": "831d7da257caef233347beb0c0f004ba084d3425",
+    "sha256": "sha256-x+nNGhYfXDyL8KKrgd18AJmeis13W5KMaGeJiSJepIM="
   }
 }

overlay/piped/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq git moreutils yarn2nix nix nix-prefetch
+#!nix-shell -i bash -p curl jq git moreutils yarn2nix nodejs_20 yarn nix nix-prefetch
 set -euo pipefail
 
 BASE_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
@@ -27,7 +27,9 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
         git clone https://github.com/TeamPiped/Piped
         pushd Piped
             git reset --hard "$new_frontend_rev"
+            yarn install --mode update-lockfile
             nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/frontend/yarn.nix"
+            cp yarn.lock "${BASE_DIR}/frontend/yarn.lock"
         popd
     popd
 fi