From 67aeb09ac28d8ad94a203cf7c95a5db134a23d81 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Mon, 29 Jan 2024 09:40:39 +1100
Subject: [PATCH] Update javascript package manager installation

---
 flake.lock              | 48 ++++++++++++++++++++---------------------
 shared/home-manager.nix |  2 ++
 shared/packages.nix     |  2 +-
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 194ae74..945bc54 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705915768,
-        "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
+        "lastModified": 1706405065,
+        "narHash": "sha256-femlVBNWgr9a6HfBUzhBF/9S8VBlaHDKcEm8B89O+zc=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
+        "rev": "0108864c15bb68ad57d17fb2e7d3a3e025751d79",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1706134977,
-        "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=",
+        "lastModified": 1706435589,
+        "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10",
+        "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     "homebrew-bundle": {
       "flake": false,
       "locked": {
-        "lastModified": 1705667118,
-        "narHash": "sha256-wijKBOVy8/oXDyRl/tg6YFqzIxfHSOPEHh42EmiK/X4=",
+        "lastModified": 1706257831,
+        "narHash": "sha256-ixt1d1Wg7ZZ4Itv9OvqPTAaXbI+W8UvKErny4CGBMkY=",
         "owner": "homebrew",
         "repo": "homebrew-bundle",
-        "rev": "d44243fe191e962fce60cbf8e25b6f2e3c1248b3",
+        "rev": "092a87834411b10357b0cb7ad1a54b6618fe4a79",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1706154700,
-        "narHash": "sha256-/MXbzat0hb9qOsQ5xoI9q3VEVyVld5TEVsKgD6kn61s=",
+        "lastModified": 1706468959,
+        "narHash": "sha256-Ve0AFf5m5PhZaMCTO6vbM4Lm22jazOz2Ql7cV7ek8h4=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "d1179af95bfc990907088ebb273820389e405c09",
+        "rev": "3c7d9dc50a08512385168e161efd339352bd2c09",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     "homebrew-cask-fonts": {
       "flake": false,
       "locked": {
-        "lastModified": 1706148343,
-        "narHash": "sha256-L4Su4uq7RpYGJfk5C9opCDPblzsziAqY8jYoewof+cM=",
+        "lastModified": 1706401183,
+        "narHash": "sha256-GuEPY3wV9wNXJw+vqvB9bddwLmNZH/ywQrXqMVcd/84=",
         "owner": "homebrew",
         "repo": "homebrew-cask-fonts",
-        "rev": "9cfef62b9aa4d467d265a253149252a17f11ecdd",
+        "rev": "3715cf445c694efdd020b3dff7d349af566c5e7e",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1706154731,
-        "narHash": "sha256-clHGxfOVbtgXDoXiDYO8uzvuMMp88UVLiHO+ZQDM24A=",
+        "lastModified": 1706480118,
+        "narHash": "sha256-Fk8uGt5mQODQTmwREEc9tPP6djccS/OOUmc7ivretmo=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "0f18eb80197d2b7f0cd352163cbc46d3e0d5b2f8",
+        "rev": "02da2688034f419b43e14108d0e053c782e4fbe2",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705677747,
-        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
+        "lastModified": 1706191920,
+        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
+        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1705856552,
-        "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
+        "lastModified": 1706191920,
+        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
+        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
         "type": "github"
       },
       "original": {
diff --git a/shared/home-manager.nix b/shared/home-manager.nix
index 8413669..3eeede9 100644
--- a/shared/home-manager.nix
+++ b/shared/home-manager.nix
@@ -198,9 +198,11 @@ in
         "containers"
         "gem"
         "node"
+        "pnpm"
         "ruby_gems"
         "tlmgr"
         "vim"
+        "yarn"
       ];
       misc.assume_yes = true;
       misc.cleanup = true;
diff --git a/shared/packages.nix b/shared/packages.nix
index fc40b91..50305dc 100644
--- a/shared/packages.nix
+++ b/shared/packages.nix
@@ -48,6 +48,6 @@ with pkgs; [
 
   # Node.js development tools
   nodePackages.prettier
-  nodePackages.npm # globally install npm
+  corepack # install package managers
   nodejs
 ]