diff options
| author | Alan Pearce | 2019-10-04 21:55:04 +0200 |
|---|---|---|
| committer | Alan Pearce | 2019-10-04 21:55:04 +0200 |
| commit | 32259e9f49a9e4d7790f4fd694d573355c89a943 (patch) | |
| tree | d540e9c4e898e7a470a98626184edb8c59ae95af | |
| parent | c918534796c695c42824d7f34f8f442b8e0e17cc (diff) | |
| download | nixfiles-32259e9f49a9e4d7790f4fd694d573355c89a943.tar.lz nixfiles-32259e9f49a9e4d7790f4fd694d573355c89a943.tar.zst nixfiles-32259e9f49a9e4d7790f4fd694d573355c89a943.zip | |
Combine javascript configurations
| -rw-r--r-- | user/javascript/.npmrc | 8 | ||||
| -rw-r--r-- | user/modules/javascript.nix | 9 | ||||
| -rw-r--r-- | user/modules/npm.nix | 5 | ||||
| -rw-r--r-- | user/modules/satoshipay.nix | 4 | ||||
| -rw-r--r-- | user/prefect.nix | 1 | ||||
| -rw-r--r-- | user/satoshipad.nix | 2 | ||||
| -rw-r--r-- | user/trillian.nix | 2 | ||||
| -rw-r--r-- | user/yarn/.yarnrc | 9 |
8 files changed, 16 insertions, 24 deletions
diff --git a/user/javascript/.npmrc b/user/javascript/.npmrc deleted file mode 100644 index 59c9a2b4..00000000 --- a/user/javascript/.npmrc +++ /dev/null @@ -1,8 +0,0 @@ -prefix=${HOME}/.local -//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN} -@satoshipay:registry=https://registry.npmjs.org/ -always-auth=true -sign-git-tag=true -rebuild-bundle=false -update-notifier=false -registry=https://registry.npmjs.org/ \ No newline at end of file diff --git a/user/modules/javascript.nix b/user/modules/javascript.nix index eaae2ca1..4c75ea10 100644 --- a/user/modules/javascript.nix +++ b/user/modules/javascript.nix @@ -47,4 +47,13 @@ in node2nixPackages.dockerfile-language-server-nodejs node2nixPackages.yaml-language-server ]); + home.file.".npmrc".text = '' + prefix=''${HOME}/.local + //registry.npmjs.org/:_authToken=''${NPM_AUTH_TOKEN} + always-auth=true + sign-git-tag=true + rebuild-bundle=false + update-notifier=false + registry=https://registry.npmjs.org/ + ''; } diff --git a/user/modules/npm.nix b/user/modules/npm.nix deleted file mode 100644 index d2ba55d9..00000000 --- a/user/modules/npm.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: - -{ - home.file.".npmrc".source = ../javascript/.npmrc; -} diff --git a/user/modules/satoshipay.nix b/user/modules/satoshipay.nix index d59c4f1f..5821103d 100644 --- a/user/modules/satoshipay.nix +++ b/user/modules/satoshipay.nix @@ -44,4 +44,8 @@ in contents = spGitConfig; } ]; + + home.file.".npmrc".text = '' + @satoshipay:registry=https://registry.npmjs.org/ + ''; } diff --git a/user/prefect.nix b/user/prefect.nix index 9bfe6725..307ce89b 100644 --- a/user/prefect.nix +++ b/user/prefect.nix @@ -8,6 +8,7 @@ ./modules/git.nix ./modules/gnupg.nix ./modules/i3.nix + ./modules/javascript.nix ./modules/nixos.nix ./modules/rofi.nix ./modules/satoshipay.nix diff --git a/user/satoshipad.nix b/user/satoshipad.nix index e9c52f58..e08dbab8 100644 --- a/user/satoshipad.nix +++ b/user/satoshipad.nix @@ -10,9 +10,9 @@ ./modules/gnupg.nix ./modules/i3.nix ./modules/isync.nix + ./modules/javascript.nix ./modules/msmtp.nix ./modules/nixos.nix - ./modules/npm.nix ./modules/rofi.nix ./modules/satoshipay.nix ./modules/sxhkd.nix diff --git a/user/trillian.nix b/user/trillian.nix index fa268f9c..f7437d89 100644 --- a/user/trillian.nix +++ b/user/trillian.nix @@ -6,8 +6,8 @@ ./modules/emacs.nix ./modules/git.nix ./modules/gnupg.nix + ./modules/javascript.nix ./modules/nix.nix - ./modules/npm.nix ./modules/satoshipay.nix ./modules/tabnine.nix ./modules/trezor.nix diff --git a/user/yarn/.yarnrc b/user/yarn/.yarnrc deleted file mode 100644 index 6c37ae5d..00000000 --- a/user/yarn/.yarnrc +++ /dev/null @@ -1,9 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -registry "https://registry.npmjs.org/" -disable-self-update-check true -email alan@alanpearce.eu -username alanpearce -yarn-offline-mirror-pruning true |