diff options
| author | Alan Pearce | 2019-01-28 12:39:28 +0000 |
|---|---|---|
| committer | Alan Pearce | 2019-01-28 12:39:28 +0000 |
| commit | 2ab847b54ba9ab409eeb6ac8924934269990f4d8 (patch) | |
| tree | e2e19cd76f69b7d045a26f6e5aabab35a71c5f27 /modules/development | |
| parent | 24d018aae43738aae766dc9932c07f16ffb451b8 (diff) | |
| parent | 69bbccdeed216b30272e1e8a8a049987db44c6be (diff) | |
| download | nixfiles-2ab847b54ba9ab409eeb6ac8924934269990f4d8.tar.lz nixfiles-2ab847b54ba9ab409eeb6ac8924934269990f4d8.tar.zst nixfiles-2ab847b54ba9ab409eeb6ac8924934269990f4d8.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules/development')
| -rw-r--r-- | modules/development/javascript.nix | 18 | ||||
| -rw-r--r-- | modules/development/kubernetes.nix | 21 |
2 files changed, 30 insertions, 9 deletions
diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix index 37b78656..7e9dcfb4 100644 --- a/modules/development/javascript.nix +++ b/modules/development/javascript.nix @@ -1,17 +1,17 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs.unstable; [ - nodejs-8_x + nodejs-10_x - nodePackages.tern - nodePackages.node2nix - nodePackages.nodemon - nodePackages.javascript-typescript-langserver - nodePackages.eslint_d + nodePackages_10_x.tern + nodePackages_10_x.node2nix + nodePackages_10_x.nodemon + nodePackages_10_x.javascript-typescript-langserver + nodePackages_10_x.eslint_d - nodePackages.node-gyp - nodePackages.node-gyp-build - nodePackages.node-pre-gyp + nodePackages_10_x.node-gyp + nodePackages_10_x.node-gyp-build + nodePackages_10_x.node-pre-gyp ] ++ ( if stdenv.isDarwin then diff --git a/modules/development/kubernetes.nix b/modules/development/kubernetes.nix new file mode 100644 index 00000000..692e46d6 --- /dev/null +++ b/modules/development/kubernetes.nix @@ -0,0 +1,21 @@ +{ config, pkgs, ... }: + +{ + networking.bridges = { + cbr0.interfaces = []; + }; + networking.interfaces = { + cbr0 = { + ipv4.addresses = [ + { address = "10.10.0.1"; + prefixLength = 24; + } + ]; + }; + }; + services.kubernetes.roles = ["master" "node"]; + services.kubernetes.kubelet.extraOpts = "--fail-swap-on=false"; + virtualisation.docker.extraOptions = '' + --iptables=false --ip-masq=false -b cbr0 + ''; +} |