Migrate node package from nixpkgs to homebrew (#14)

* Migrate node package from nixpkgs to homebrew * Apply nixpkgs-fmt
rounakdatta · Feb 9, 2024 · c8c1c41 · c8c1c41
1 parent 4b8be37
commit c8c1c41
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/configs/bash/default.nix b/configs/bash/default.nix
@@ -12,11 +12,12 @@ in
     '' +
     (if isDarwin then
       ''
-        export PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"
-        export PATH="$PATH:/etc/profiles/per-user/${config.home.username}/bin"
-        export PATH="$PATH:/opt/homebrew/bin"
-        export JAVA_HOME=/usr/libexec/java_home
-        export PASSWORD_STORE_DIR="/Users/${config.home.username}/.password-store"
+                export PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"
+                export PATH="$PATH:/etc/profiles/per-user/${config.home.username}/bin"
+                export PATH="$PATH:/opt/homebrew/bin"
+        	export PATH="$PATH:/opt/homebrew/opt/node@18/bin"
+                export JAVA_HOME=/usr/libexec/java_home
+                export PASSWORD_STORE_DIR="/Users/${config.home.username}/.password-store"
       ''
     else
       ''

diff --git a/configs/fish/default.nix b/configs/fish/default.nix
@@ -58,12 +58,13 @@ in
     '' +
     (if isDarwin then
       ''
-        # this is needed, otherwise darwin-rebuild wouldn't be in PATH
-        fish_add_path --prepend --global "$HOME/.nix-profile/bin" /nix/var/nix/profiles/default/bin /run/current-system/sw/bin
-        set PATH $PATH /etc/profiles/per-user/${config.home.username}/bin
-        set PATH $PATH /opt/homebrew/bin
-        set JAVA_HOME /usr/libexec/java_home
-        set PASSWORD_STORE_DIR /Users/${config.home.username}/.password-store
+                # this is needed, otherwise darwin-rebuild wouldn't be in PATH
+                fish_add_path --prepend --global "$HOME/.nix-profile/bin" /nix/var/nix/profiles/default/bin /run/current-system/sw/bin
+                set PATH $PATH /etc/profiles/per-user/${config.home.username}/bin
+                set PATH $PATH /opt/homebrew/bin
+        	set PATH $PATH /opt/homebrew/opt/node@18/bin
+                set JAVA_HOME /usr/libexec/java_home
+                set PASSWORD_STORE_DIR /Users/${config.home.username}/.password-store
       ''
     else
       ''

diff --git a/hosts/ckmac/home.nix b/hosts/ckmac/home.nix
@@ -33,7 +33,6 @@
       kotlin
       shellcheck
       zoom-us
-      nodejs_18
       nixpkgs-fmt
       gradle_7
 

diff --git a/hosts/ckmac/software.nix b/hosts/ckmac/software.nix
@@ -43,6 +43,7 @@
       "pulumi/tap/pulumi"
       "skaffold"
       "watch"
+      "node@18"
       "yarn" # the JS package manager, not the hadoop scheduler
       "azure-cli"
       "ollama"