From 00a2f04ba973d3e4fce37cc420ffc07e67944a18 Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <gpg@kogakure.8shield.net>
Date: Wed, 31 Jul 2024 19:12:34 +0200
Subject: [PATCH] fix(nix): problem with yarn and asdf

---
 darwin/homebrew-common.nix |  3 +++
 home/asdf/default.nix      |  3 ---
 home/default.nix           | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/darwin/homebrew-common.nix b/darwin/homebrew-common.nix
index abeaa87..e5c6639 100644
--- a/darwin/homebrew-common.nix
+++ b/darwin/homebrew-common.nix
@@ -7,6 +7,7 @@
     "homebrew/services" # Manage background services using the daemon manager launchctl on macOS or systemctl on Linux.
   ];
   brews = [
+    "asdf" # Extendable version manager with support for Ruby, Node.js, Erlang & more
     "cava" # Console-based Audio Visualizer for ALSA
     "fileicon" # macOS CLI for managing custom icons for files and folders
     "gettext" # INFO: Dependency of Neovim
@@ -17,6 +18,8 @@
     "prettier" # Code formatter for JavaScript, CSS, JSON, GraphQL, Markdown, YAML
     "tree-sitter" # INFO: Dependency of Neovim
     "urlview" # URL extractor/launcher
+    "volta" # JavaScript toolchain manager for reproducible environments
+    "yarn" # JavaScript package manager
   ];
   casks = [
     "affinity-designer" # Professional graphic design software
diff --git a/home/asdf/default.nix b/home/asdf/default.nix
index 460dd3f..15928fc 100644
--- a/home/asdf/default.nix
+++ b/home/asdf/default.nix
@@ -7,8 +7,5 @@
     ".default-gems" = { source = ./default-gems; };
     ".default-npm-packages" = { source = ./default-npm-packages; };
     ".default-python-packages" = { source = ./default-python-packages; };
-    ".asdf/lib".source = "${pkgs.asdf-vm}/share/asdf-vm/lib";
   };
-
-  home.packages = [ pkgs.asdf-vm ];
 }
diff --git a/home/default.nix b/home/default.nix
index 9fd3b3b..9fcdda6 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -83,6 +83,9 @@ in
       # Personal scripts
       "$HOME/.dotfiles/private/bin"
 
+      # ASDF
+      "$HOME/.asdf/shims"
+
       # Homebrew
       "/opt/homebrew/bin"
       "/opt/homebrew/sbin"
@@ -101,9 +104,6 @@ in
 
       # Volta
       "$VOLTA_HOME/bin"
-
-      # ASDF
-      "$HOME/.asdf/shims"
     ];
 
     # Let Home Manager install and manage itself.
@@ -167,14 +167,14 @@ in
       vhs # Tool for generating terminal GIFs with code
       watchman # Watches files and takes action when they change
       woff2 # Webfont compression reference code
-      yarn # Fast, reliable, and secure dependency management for javascript
+      # yarn # Fast, reliable, and secure dependency management for javascript
       yt-dlp # Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)
       zoxide # A faster way to navigate your filesystem
 
       # Programming Languages
       lua # Powerful, fast, lightweight, embeddable scripting language
-      nodejs_22 # Event-driven I/O framework for the V8 JavaScript engine
-      corepack_22 # Wrappers for npm, pnpm and Yarn via Node.js Corepack
+      # nodejs_22 # Event-driven I/O framework for the V8 JavaScript engine
+      # corepack_22 # Wrappers for npm, pnpm and Yarn via Node.js Corepack
       perl # Standard implementation of the Perl 5 programming language
       php # HTML-embedded scripting language
       python3 # High-level dynamically-typed programming language