diff options
| -rw-r--r-- | system/marvin.nix | 1 | ||||
| -rw-r--r-- | system/prefect.nix | 1 | ||||
| -rw-r--r-- | system/satoshipad.nix | 1 | ||||
| -rw-r--r-- | system/trillian.nix | 1 | ||||
| -rw-r--r-- | user/modules/javascript.nix (renamed from system/modules/development/javascript.nix) | 4 | ||||
| -rw-r--r-- | user/modules/satoshipay.nix | 4 | ||||
| -rw-r--r-- | user/packages/node2nix/Makefile (renamed from system/packages/node2nix/Makefile) | 0 | ||||
| -rw-r--r-- | user/packages/node2nix/default.nix (renamed from system/packages/node2nix/default.nix) | 0 | ||||
| -rw-r--r-- | user/packages/node2nix/node-env.nix (renamed from system/packages/node2nix/node-env.nix) | 0 | ||||
| -rw-r--r-- | user/packages/node2nix/node-packages.json (renamed from system/packages/node2nix/node-packages.json) | 0 | ||||
| -rw-r--r-- | user/packages/node2nix/node-packages.nix (renamed from system/packages/node2nix/node-packages.nix) | 0 |
11 files changed, 6 insertions, 6 deletions
diff --git a/system/marvin.nix b/system/marvin.nix index 0a7aceb5..6c2e4f28 100644 --- a/system/marvin.nix +++ b/system/marvin.nix @@ -9,7 +9,6 @@ ./modules/configuration/nix.nix ./modules/configuration/user.nix ./modules/development/base.nix - ./modules/development/javascript.nix ./modules/development/lisp.nix ./modules/hardware/adb.nix ./modules/hardware/audio.nix diff --git a/system/prefect.nix b/system/prefect.nix index b2a7dcd9..2b4c1ccf 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -10,7 +10,6 @@ ./modules/configuration/nix.nix ./modules/configuration/user.nix ./modules/development/base.nix - ./modules/development/javascript.nix ./modules/development/lisp.nix ./modules/hardware/audio.nix ./modules/hardware/bare-metal.nix diff --git a/system/satoshipad.nix b/system/satoshipad.nix index d473eb33..2a584fbe 100644 --- a/system/satoshipad.nix +++ b/system/satoshipad.nix @@ -11,7 +11,6 @@ ./modules/configuration/nix.nix ./modules/configuration/user.nix ./modules/development/base.nix - ./modules/development/javascript.nix ./modules/hardware/audio.nix ./modules/hardware/systemd-boot.nix ./modules/hardware/keyboardio-model01.nix diff --git a/system/trillian.nix b/system/trillian.nix index 8c1f0deb..965e3345 100644 --- a/system/trillian.nix +++ b/system/trillian.nix @@ -5,7 +5,6 @@ ./private/default.nix ./modules/development/base.nix - ./modules/development/javascript.nix ./modules/programs/accounting.nix ./modules/programs/dotfiles.nix ./modules/programs/shell.nix diff --git a/system/modules/development/javascript.nix b/user/modules/javascript.nix index 1bdd4a4c..eaae2ca1 100644 --- a/system/modules/development/javascript.nix +++ b/user/modules/javascript.nix @@ -3,12 +3,12 @@ let node = pkgs.unstable.nodejs-10_x; npmPackages = pkgs.unstable.nodePackages_10_x; - node2nixPackages = import ../../packages/node2nix/default.nix { + node2nixPackages = import ../packages/node2nix/default.nix { pkgs = pkgs.unstable; nodejs = node; }; in -{ environment.systemPackages = (with pkgs.unstable; [ +{ home.packages = (with pkgs.unstable; [ node ] ++ ( if stdenv.isDarwin diff --git a/user/modules/satoshipay.nix b/user/modules/satoshipay.nix index 6feefbbb..ca396aad 100644 --- a/user/modules/satoshipay.nix +++ b/user/modules/satoshipay.nix @@ -6,6 +6,10 @@ let }; in { + imports = [ + ./javascript.nix + ]; + programs.git.includes = [ { condition = "gitdir:~/projects/github.com/satoshipay/"; diff --git a/system/packages/node2nix/Makefile b/user/packages/node2nix/Makefile index d829eeb5..d829eeb5 100644 --- a/system/packages/node2nix/Makefile +++ b/user/packages/node2nix/Makefile diff --git a/system/packages/node2nix/default.nix b/user/packages/node2nix/default.nix index fa0a1482..fa0a1482 100644 --- a/system/packages/node2nix/default.nix +++ b/user/packages/node2nix/default.nix diff --git a/system/packages/node2nix/node-env.nix b/user/packages/node2nix/node-env.nix index 670556bf..670556bf 100644 --- a/system/packages/node2nix/node-env.nix +++ b/user/packages/node2nix/node-env.nix diff --git a/system/packages/node2nix/node-packages.json b/user/packages/node2nix/node-packages.json index 3f6e020b..3f6e020b 100644 --- a/system/packages/node2nix/node-packages.json +++ b/user/packages/node2nix/node-packages.json diff --git a/system/packages/node2nix/node-packages.nix b/user/packages/node2nix/node-packages.nix index ae1ee1bd..ae1ee1bd 100644 --- a/system/packages/node2nix/node-packages.nix +++ b/user/packages/node2nix/node-packages.nix |