diff options
| -rw-r--r-- | modules/development/javascript.nix | 18 | ||||
| -rw-r--r-- | modules/development/kubernetes.nix | 21 | ||||
| -rw-r--r-- | modules/machines/t470s.nix | 4 | ||||
| -rw-r--r-- | modules/satoshipay.nix | 22 | ||||
| -rw-r--r-- | modules/services/xserver.nix | 4 | ||||
| -rw-r--r-- | modules/user-interface.nix | 1 | ||||
| -rw-r--r-- | satoshipad.nix | 1 |
7 files changed, 52 insertions, 19 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 + ''; +} diff --git a/modules/machines/t470s.nix b/modules/machines/t470s.nix index d729beac..844a4f57 100644 --- a/modules/machines/t470s.nix +++ b/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 = '' diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 75a04078..5198cc14 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -12,12 +12,6 @@ enable = true; }; }; - - virtualbox = { - host = { - enable = true; - }; - }; }; nixpkgs.config.allowUnfree = true; @@ -26,16 +20,15 @@ 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 ]; @@ -53,6 +46,17 @@ 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"; + }; + }; services.redis = { enable = true; diff --git a/modules/services/xserver.nix b/modules/services/xserver.nix index fd4d52c6..36790fe0 100644 --- a/modules/services/xserver.nix +++ b/modules/services/xserver.nix @@ -40,7 +40,11 @@ serif = [ "Liberation Serif" ]; }; penultimate = { + enable = false; + }; + ultimate = { enable = true; + preset = "osx"; }; }; fonts = with pkgs; [ diff --git a/modules/user-interface.nix b/modules/user-interface.nix index 5793a124..6ece6729 100644 --- a/modules/user-interface.nix +++ b/modules/user-interface.nix @@ -34,7 +34,6 @@ in unstable.pass-otp - calibre mpv mosh diff --git a/satoshipad.nix b/satoshipad.nix index 68a9d683..e4a82246 100644 --- a/satoshipad.nix +++ b/satoshipad.nix @@ -13,6 +13,7 @@ ./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 |