From 5c1f85d792aa73f90c5e72df4ad0a09997cd101e Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 12 Dec 2020 00:25:35 +0100
Subject: Use nixpkgs for more NPM packages

---
 user/settings/javascript.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'user/settings')

diff --git a/user/settings/javascript.nix b/user/settings/javascript.nix
index 4c6fc6c2..a820b6c3 100644
--- a/user/settings/javascript.nix
+++ b/user/settings/javascript.nix
@@ -2,7 +2,6 @@
 
 let
   node = pkgs.nodejs-12_x;
-  node10Packages = pkgs.nodePackages;
 in
 { home.packages = (with pkgs; [
     node
@@ -18,9 +17,10 @@ in
     gcc
     python2
     ]
-  )) ++ (with node10Packages; [
+  )) ++ (with pkgs.nodePackages; [
     node2nix
     nodemon
+    dockerfile-language-server-nodejs
     javascript-typescript-langserver
     typescript-language-server
     vscode-css-languageserver-bin
@@ -28,17 +28,16 @@ in
     csslint
     eslint_d
     typescript
-  ]) ++ (with pkgs.node2nixPackages; [
-    pkgs.node2nixPackages."pnpm-5.4.11"
 
     node-gyp
     node-gyp-build
     node-pre-gyp
+  ]) ++ (with pkgs.node2nixPackages; [
+    pkgs.node2nixPackages."pnpm-5.4.11"
 
     stylelint
 
     pino-pretty
-    dockerfile-language-server-nodejs
   ]);
 
   home.sessionVariables = {
-- 
cgit 1.4.1