all repos — nixfiles @ 9dad0ca18a9b689a0e119b33e18fd5bf195c7071

System and user configuration, managed by nix and home-manager

Move javascript package setup to home-manager
Alan Pearce alan@alanpearce.eu
Fri, 04 Oct 2019 16:32:12 +0200
commit

9dad0ca18a9b689a0e119b33e18fd5bf195c7071

parent

40aab9ce6874a9d60319058c24b475ff67adf88e

11 files changed, 6 insertions(+), 6 deletions(-)

jump to
M system/marvin.nix → system/marvin.nix
@@ -9,7 +9,6 @@ ./modules/configuration/british-english.nix     ./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
M system/modules/development/javascript.nix → 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
M system/prefect.nix → system/prefect.nix
@@ -10,7 +10,6 @@ ./modules/configuration/british-english.nix     ./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
M system/satoshipad.nix → system/satoshipad.nix
@@ -11,7 +11,6 @@ ./modules/configuration/british-english.nix     ./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
M system/trillian.nix → system/trillian.nix
@@ -5,7 +5,6 @@ imports = [     ./private/default.nix
 
     ./modules/development/base.nix
-    ./modules/development/javascript.nix
     ./modules/programs/accounting.nix
     ./modules/programs/dotfiles.nix
     ./modules/programs/shell.nix
M user/modules/satoshipay.nix → user/modules/satoshipay.nix
@@ -6,6 +6,10 @@ user.email = "alan@satoshipay.io";   };
 in
 {
+  imports = [
+    ./javascript.nix
+  ];
+
   programs.git.includes = [
     {
       condition = "gitdir:~/projects/github.com/satoshipay/";