diff --git a/nix/hm/frontend-dev.nix b/nix/hm/frontend-dev.nix index 72bd4c3f..e9822479 100644 --- a/nix/hm/frontend-dev.nix +++ b/nix/hm/frontend-dev.nix @@ -8,6 +8,7 @@ fnm bun nodejs + pnpm # biome nodePackages.prettier nodePackages.eslint @@ -23,9 +24,14 @@ FNM_DIR = "$HOME/.fnm"; FNM_LOGLEVEL = "error"; PNPM_HOME = "${config.xdg.dataHome}/pnpm"; + NPM_CONFIG_CACHE = "${config.xdg.cacheHome}/npm"; + NPM_CONFIG_PREFIX = "${config.xdg.dataHome}/npm"; + NPM_CONFIG_TMP = "${config.xdg.cacheHome}/npm-tmp"; + COREPACK_HOME = "${config.xdg.cacheHome}/node/corepack"; }; home.sessionPath = [ "${config.xdg.dataHome}/pnpm" + "$NPM_CONFIG_PREFIX/bin" ]; programs.fish.interactiveShellInit = '' diff --git a/nix/home.nix b/nix/home.nix index 589e0e21..3ff62df9 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -19,7 +19,7 @@ zls # vim-zellij-navigator path-git-format - # uclanr + uclanr nix-prefetch-github nerd-font-patcher (nerdfonts.override { diff --git a/nix/overlay.nix b/nix/overlay.nix index 98820ecd..c0a4af01 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -6,10 +6,10 @@ system = final.system; }; # git-fuzzy = final.callPackage ./pkgs/git-fuzzy.nix {}; - # uclanr = final.callPackage ./pkgs/uclanr.nix { - # pkgs = final; - # system = final.system; - # }; + uclanr = final.callPackage ./pkgs/uclanr.nix { + pkgs = final; + system = final.system; + }; nerd-font-patcher = let nerdFontPatcherVersion = "3.2.1"; in diff --git a/nix/pkgs/uclanr.nix b/nix/pkgs/uclanr.nix index 2118f73c..e4be55cb 100644 --- a/nix/pkgs/uclanr.nix +++ b/nix/pkgs/uclanr.nix @@ -3,12 +3,16 @@ pkgs ? (import {}), }: let version = "2.1.0"; + # NOTE: the tar must contain file only. + # tar -czvf xxxx.tar.gz ./somefile tarballUrlMap = { x86_64-darwin = "https://github.com/Axlefublr/uclanr/releases/download/${version}/uclanr-x86_64-apple-darwin.tar.gz"; + aarch64-darwin = "https://github.com/pze/uclanr/releases/download/v0.0.2/uclanr-aarch64-darwin.tar.gz"; }; tarballUrl = tarballUrlMap.${system}; sha256-map = { x86_64-darwin = "0jr6iwll1sb02yp9l31k119jan7dy0liyw729ci49mjvhwnb5jsh"; + aarch64-darwin = "1dghijdk2i3j95f4nl1hg6y94kllbavicykqpgdf1b9vmrxj1yq1"; }; tarbar = builtins.fetchurl { url = tarballUrl;