From 7d36785ec81a2ce337512816ec5c75273bf969b4 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 22 Nov 2018 16:16:23 +0100 Subject: T470s: Use reasonable temperature sensor --- modules/machines/t470s.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules') 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 = '' -- cgit 1.4.1 From 594de27ef6882766a1673660d61c4c2fc7bc1fa1 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 27 Nov 2018 15:34:48 +0100 Subject: SatoshiPay: update package list --- modules/satoshipay.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 75a04078..fdc3532b 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -26,7 +26,6 @@ openssl google-chrome docker_compose - meteor minikube mongodb-tools s3cmd @@ -35,7 +34,7 @@ unstable.kubernetes unstable.redis-desktop-manager unstable.kubernetes-helm - unstable.kompose + unstable.helmfile unstable.robo3t unstable.slack ]; -- cgit 1.4.1 From 7a69a1c482830adb17a3be73d437c6d8f54183a2 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 11 Dec 2018 15:54:22 +0100 Subject: SatoshiPay: remove virtualbox --- modules/satoshipay.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'modules') diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index fdc3532b..1733123a 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -12,12 +12,6 @@ enable = true; }; }; - - virtualbox = { - host = { - enable = true; - }; - }; }; nixpkgs.config.allowUnfree = true; -- cgit 1.4.1 From 702b3985219e6b1c0d4a7316a87b142c9218c16a Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 11 Dec 2018 15:57:01 +0100 Subject: SatoshiPay: remove minikube --- modules/satoshipay.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'modules') diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 1733123a..7f1b0c71 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -20,7 +20,6 @@ openssl google-chrome docker_compose - minikube mongodb-tools s3cmd sops -- cgit 1.4.1 From a17c83e793f0234f6cff02726c9b7d53b92a3304 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 7 Jan 2019 15:45:59 +0100 Subject: javascript: Update to node 10 --- modules/development/javascript.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'modules') 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 -- cgit 1.4.1 From d300ba19bdff556ba765a5ff6d7101bf27265271 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 7 Jan 2019 15:46:17 +0100 Subject: satoshipay: Install kubectx --- modules/satoshipay.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 7f1b0c71..46cccc75 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -25,6 +25,7 @@ sops unstable.google-cloud-sdk unstable.kubernetes + unstable.kubectx unstable.redis-desktop-manager unstable.kubernetes-helm unstable.helmfile -- cgit 1.4.1 From 837b394c5eec1bf3b7cb92b8a5b1f5a76eb82802 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 7 Jan 2019 15:46:54 +0100 Subject: xserver: Tweak font rendering I have no idea what I'm doing, but this seems to look nice, even if it's not like macOS. --- modules/services/xserver.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules') 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; [ -- cgit 1.4.1 From 89667596a464800efcbcc7fca223f32a206102d5 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 15 Jan 2019 11:04:37 +0100 Subject: Remove calibre --- modules/user-interface.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'modules') 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 -- cgit 1.4.1 From 828aa5453eb7301367d252ff839b38e01e3047a1 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 15 Jan 2019 11:04:52 +0100 Subject: Add kubernetes module for local infrastructure work --- modules/development/kubernetes.nix | 21 +++++++++++++++++++++ satoshipad.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 modules/development/kubernetes.nix (limited to 'modules') 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/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 -- cgit 1.4.1 From 69bbccdeed216b30272e1e8a8a049987db44c6be Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 15 Jan 2019 11:05:28 +0100 Subject: SatoshiPay: init replicaset at startup --- modules/satoshipay.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'modules') diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 46cccc75..5198cc14 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -46,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; -- cgit 1.4.1