diff options
| author | Alan Pearce | 2024-03-24 21:51:28 +0100 |
|---|---|---|
| committer | Alan Pearce | 2024-03-24 21:51:42 +0100 |
| commit | f4454bfe04fde6b14c656302375e9bcac34edc92 (patch) | |
| tree | 576ecba032b8fb93d7137bd44ba0f7c27612191d /user/settings | |
| parent | 62267a702699dcef06979c8481d3b0b1a5b2787f (diff) | |
| download | nixfiles-f4454bfe04fde6b14c656302375e9bcac34edc92.tar.lz nixfiles-f4454bfe04fde6b14c656302375e9bcac34edc92.tar.zst nixfiles-f4454bfe04fde6b14c656302375e9bcac34edc92.zip | |
javascript: simplify and update setup
Diffstat (limited to 'user/settings')
| -rw-r--r-- | user/settings/development/clojure.nix | 3 | ||||
| -rw-r--r-- | user/settings/development/javascript.nix | 40 |
2 files changed, 9 insertions, 34 deletions
diff --git a/user/settings/development/clojure.nix b/user/settings/development/clojure.nix index d240b805..c85bf869 100644 --- a/user/settings/development/clojure.nix +++ b/user/settings/development/clojure.nix @@ -4,8 +4,7 @@ }: { home.packages = with pkgs; [ clojure - node2nixPackages.node-cljfmt - node2nixPackages.shadow-cljs + cljfmt ]; programs.emacs.extraPackages = epkgs: (with epkgs; [ cider diff --git a/user/settings/development/javascript.nix b/user/settings/development/javascript.nix index 8bb0375f..f677d28a 100644 --- a/user/settings/development/javascript.nix +++ b/user/settings/development/javascript.nix @@ -3,33 +3,16 @@ , ... }: let - nodejs = pkgs.nodejs-18_x; + nodejs = pkgs.nodejs; in { - nixpkgs.overlays = [ - (self: super: { - node2nixPackages = super.callPackage ../../packages/node2nix { - inherit nodejs; - }; - }) - ]; home.packages = - (with pkgs; - [ + (with pkgs; [ nodejs bun - ] - ++ ( - if stdenv.isDarwin - then [ - ] - else [ - # npm install may use any of these - binutils - gnumake - gcc - ] - )) + pnpm-shell-completion + bunyan-rs + ]) ++ (with pkgs.nodePackages; [ node2nix nodemon @@ -37,15 +20,8 @@ in typescript-language-server eslint_d typescript - - node-gyp - node-gyp-build - node-pre-gyp - ]) - ++ (with pkgs.node2nixPackages; [ - pkgs.node2nixPackages."pnpm-7.12" - - pino-pretty + pnpm + npm-merge-driver ]); home.sessionVariables = { @@ -68,7 +44,7 @@ in avaf = "bunx ava --fail-fast"; avafw = "bunx ava --fail-fast --watch"; avawf = "bunx ava --fail-fast --watch"; - pino = "pino-pretty"; + pino = "bunyan"; mocha = "bunx mocha"; standard = "bunx standard"; tsc = "bunx tsc"; |