Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.eu
Mon, 28 Jan 2019 12:39:28 +0000
7 files changed, 52 insertions(+), 19 deletions(-)
M modules/development/javascript.nix → 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
A 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 + ''; +}
M modules/machines/t470s.nix → modules/machines/t470s.nix
@@ -7,6 +7,10 @@ ]; boot.kernelPackages = pkgs.linuxPackages_4_18; + services.thinkfan.sensors = '' + hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp1_input + ''; + systemd.services.ModemManager.enable = true; hardware.pulseaudio.extraConfig = ''
M modules/satoshipay.nix → modules/satoshipay.nix
@@ -12,12 +12,6 @@ autoPrune = { enable = true; }; }; - - virtualbox = { - host = { - enable = true; - }; - }; }; nixpkgs.config.allowUnfree = true; @@ -26,16 +20,15 @@ environment.systemPackages = with pkgs; [ openssl google-chrome docker_compose - meteor - minikube mongodb-tools s3cmd sops unstable.google-cloud-sdk unstable.kubernetes + unstable.kubectx unstable.redis-desktop-manager unstable.kubernetes-helm - unstable.kompose + unstable.helmfile unstable.robo3t unstable.slack ]; @@ -51,6 +44,17 @@ description = "Delayed startup of MongoDB"; wantedBy = [ "timers.target" ]; timerConfig = { OnActiveSec = "1 min"; + }; + }; + systemd.services.mongodb-init = { + description = "Init mongodb replicaset"; + requires = [ "mongodb.service" ]; + script = "${pkgs.mongodb}/bin/mongo --eval 'rs.initiate()'"; + }; + systemd.timers.mongodb-init = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnActiveSec = "2 min"; }; };
M modules/services/xserver.nix → modules/services/xserver.nix
@@ -40,7 +40,11 @@ sansSerif = [ "Liberation Sans" ]; serif = [ "Liberation Serif" ]; }; penultimate = { + enable = false; + }; + ultimate = { enable = true; + preset = "osx"; }; }; fonts = with pkgs; [
M modules/user-interface.nix → modules/user-interface.nix
@@ -34,7 +34,6 @@ weechat unstable.pass-otp - calibre mpv mosh
M satoshipad.nix → satoshipad.nix
@@ -13,6 +13,7 @@ ./modules/configuration/user.nix ./modules/development/base.nix ./modules/development/javascript.nix ./modules/development/lisp.nix + ./modules/development/kubernetes.nix ./modules/hardware/adb.nix ./modules/hardware/audio.nix ./modules/hardware/systemd-boot.nix